免单季BUG修改

src/main/java/com/ygj/yuemum/component/ScheduledService.java

@@ -16,12 +16,12 @@ public class ScheduledService {
     public void timerCron() {
 //        weChatInfoService.SaveWeChatInfo();
     }
-    @Scheduled(fixedRate = 5400000)
+    @Scheduled(cron="0 */4 * * * ?")
     public void getMiniAppAccess_token() {
 //        weChatInfoService.SaveMiniAppInfo();
     }
 
-    @Scheduled(fixedRate = 1440000)
+    @Scheduled(initialDelay = 1000, fixedDelay = 70000*1000)
     public void getAuth() {
 //        baiDuInfoServices.getAuth();
     }

src/main/java/com/ygj/yuemum/controller/equipment/EquipmenteHireHeadController.java

@@ -33,6 +33,11 @@ public class EquipmenteHireHeadController {
         return equipmenteHireHeadService.addEquipmenteHireHeadOnline(equipmenteHireHead);
     }
 
+    @PostMapping("/updateEquipmenteHireHeadOnline")
+    public int updateEquipmenteHireHeadOnline(@ModelAttribute EquipmenteHireHead equipmenteHireHead) {
+        return equipmenteHireHeadService.updateEquipmenteHireHeadOnline(equipmenteHireHead);
+    }
+
     @GetMapping("/deleteEquipmenteHireHead")
     public int deleteEquipmenteHireHead(@RequestParam("eh_code") String eh_code) {
         return equipmenteHireHeadService.deleteEquipmenteHireHead(eh_code);

src/main/java/com/ygj/yuemum/controller/global/WeChatInfoController.java

@@ -31,6 +31,7 @@ public class WeChatInfoController {
     @PostMapping("/getWxDecrypt")
     public String getWxDecrypt(@RequestParam("encrypData") String encrypData, @RequestParam("ivData") String ivData, @RequestParam("openid") String openid) {
         return saveWeChatInfo.getWxDecrypt(encrypData,ivData,openid);
+//        return "undefined";
     }
     @GetMapping("/WXSendOrderMessage")
     public int WXSendOrderMessage(@RequestParam("orderno") String orderno,@RequestParam("total") String total,@RequestParam("date") String date) throws IOException {

src/main/java/com/ygj/yuemum/controller/wxmini/WXPromotionController.java

@@ -19,4 +19,9 @@ public class WXPromotionController {
         List<WXPromotion> wxPromotions = wxPromotionService.getPromotions();
         return wxPromotions;
     }
+    @GetMapping("/getIndexPromotions")
+    public List<WXPromotion> getIndexPromotions() {
+        List<WXPromotion> wxPromotions = wxPromotionService.getIndexPromotions();
+        return wxPromotions;
+    }
 }

src/main/java/com/ygj/yuemum/dao/equipment/EquipmenteHireHeadDao.java

@@ -14,6 +14,7 @@ public interface EquipmenteHireHeadDao {
     int deleteByPrimaryKey(String eh_code);
     int insertSelective(EquipmenteHireHead record);
     int updateByPrimaryKeySelective(EquipmenteHireHead record);
+    int updateEquipmenteHireHeadOnline(EquipmenteHireHead record);
     int updateEqorderStatus(EquipmenteHireHead record);
     int getSeq();
 }

src/main/java/com/ygj/yuemum/dao/wxmini/WXPromotionDao.java

@@ -9,4 +9,5 @@ import java.util.List;
 public interface WXPromotionDao {
 
     List<WXPromotion> getPromotions();
+    List<WXPromotion> getIndexPromotions();
 }

src/main/java/com/ygj/yuemum/domain/distributionchannel/DcIntroduceLog.java

@@ -12,11 +12,20 @@ public class DcIntroduceLog {
     private String xul_date;
     private String xul_introducer_phone;
     private String xul_introducer_phoneOld;
+    private Integer od_order_amount;
     private Integer od_rebate_amount;
     private Integer xul_pm_type;
     private String xul_orderno;
     private Float xul_rebateamount;
 
+    public Integer getOd_order_amount() {
+        return od_order_amount;
+    }
+
+    public void setOd_order_amount(Integer od_order_amount) {
+        this.od_order_amount = od_order_amount;
+    }
+
     public Float getXul_rebateamount() {
         return xul_rebateamount;
     }

src/main/java/com/ygj/yuemum/domain/wxmini/WXPromotion.java

@@ -6,10 +6,19 @@ public class WXPromotion {
     private String wp_desc;
     private String wp_url;
     private String wp_href;
+    private String wp_index_url;
     private String wp_startdate;
     private String wp_enddate;
     private String wp_isexpire;
 
+    public String getWp_index_url() {
+        return wp_index_url;
+    }
+
+    public void setWp_index_url(String wp_index_url) {
+        this.wp_index_url = wp_index_url;
+    }
+
     public String getWp_isexpire() {
         return wp_isexpire;
     }

src/main/java/com/ygj/yuemum/service/distributionchannel/DcIntroducerExtractService.java

@@ -69,6 +69,7 @@ public class DcIntroducerExtractService {
             if (dcIntroducerExtract.getWue_type() == 3) { //打款 增加提现金额
                 DcIntroducer dcIntroducer = dcIntroducerService.checkDcIntroducers(dcIntroducerExtract.getWue_phone());
                 dcIntroducer.setWv_withdraw_total(dcIntroducer.getWv_withdraw_total() + dcIntroducerExtract.getWue_approversum());
+                dcIntroducer.setWv_extract_count(dcIntroducer.getWv_extract_count() + 1);
                 dcIntroducerService.updateDcIntroducer(dcIntroducer);
             }
             dcIntroducerExtractDao.updateDcIntroducerExtract(dcIntroducerExtract);

src/main/java/com/ygj/yuemum/service/distributionchannel/MiniAppService.java

@@ -16,11 +16,13 @@ import org.apache.http.protocol.HTTP;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 @Service
 public class MiniAppService {
     @Autowired
@@ -29,6 +31,7 @@ public class MiniAppService {
     private DcIntroducerService dcIntroducerService;
     public static final String qrcode = Constant.QRCODE;
     public static final String httpqrcode = Constant.HTTPQRCODE;
+
     public String createQrCode(String phone) {
         try {
             MiniAppInfo miniAppInfo = miniAppInfoDao.getMiniAppInfo();
@@ -36,11 +39,11 @@ public class MiniAppService {
             // 创建httpclient对象
             CloseableHttpClient httpClient = HttpClients.createDefault();
             // 创建post方式请求对象
-            HttpPost httpPost = new HttpPost("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + access_token );
+            HttpPost httpPost = new HttpPost("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + access_token);
             Map<String, Object> paras = new HashMap<>();
-            paras.put("scene",phone);
-            paras.put("page","pages/index/index");
-            paras.put("width","1280px");
+            paras.put("scene", phone);
+            paras.put("page", "pages/index/index");
+            paras.put("width", "1280px");
             paras.put("auto_color", true);
             String jsonstr = JSON.toJSONString(paras);
             StringEntity stringEntity = new StringEntity(jsonstr);
@@ -49,6 +52,10 @@ public class MiniAppService {
             httpPost.addHeader(HTTP.CONTENT_TYPE, "application/json");
             httpPost.setEntity(stringEntity);
             stringEntity.setContentType("image/png");
+            File fileDel = new File(qrcode + "/" + phone + ".png");
+            if (fileDel.exists()) {
+                fileDel.delete();
+            }
             CloseableHttpResponse response = httpClient.execute(httpPost);
             if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
                 InputStream inputStream = response.getEntity().getContent();
@@ -56,7 +63,7 @@ public class MiniAppService {
                 //保存到数据库
                 byte[] buffer = new byte[8192];
                 int bytesRead = 0;
-                while((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
+                while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
                     out.write(buffer, 0, bytesRead);
                 }
                 out.flush();
@@ -70,15 +77,17 @@ public class MiniAppService {
             return "error";
         }
     }
+
     public int initQrcode() {
         try {
             List<DcIntroducer> dcIntroducers = dcIntroducerService.initIntroducers();
-            for (DcIntroducer di:dcIntroducers){
+            for (DcIntroducer di : dcIntroducers) {
                 DcIntroducer dcIntroducerNew = new DcIntroducer();
                 dcIntroducerNew.setId(di.getId());
                 dcIntroducerNew.setWv_phone(di.getWv_phone());
                 dcIntroducerNew.setWv_qrcode(createQrCode(di.getWv_phone()));
                 dcIntroducerService.updateDcIntroducer(dcIntroducerNew);
+                Thread.sleep(3000);
             }
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/ygj/yuemum/service/equipment/EquipmentReturnService.java

@@ -75,15 +75,15 @@ public class EquipmentReturnService {
                 if(ed.getEt_type().equals("1")){
                     //modoo active
                     modooApiService.equipmentSettle(ed.getEd_emcode());
+                    ModooEquipmentLog modooEquipmentLog = new ModooEquipmentLog();
+                    modooEquipmentLog.setMl_type(2);
+                    modooEquipmentLog.setCm_phone(equipmentReturn.getEh_code());
+                    modooEquipmentLog.setMl_code(ed.getEd_emcode());
+                    modooEquipmentLog.setMl_date(sdfdate.format(new Date()));
+                    modooEquipmentLog.setMl_username(equipmentReturn.getEr_usercode());
+                    modooEquipmentLogService.insertModooEquipmentLog(modooEquipmentLog);
                 }
-                ModooEquipmentLog modooEquipmentLog = new ModooEquipmentLog();
-                modooEquipmentLog.setMl_type(2);
-                modooEquipmentLog.setCm_phone(equipmentReturn.getEh_code());
-                modooEquipmentLog.setMl_code(ed.getEd_emcode());
-                modooEquipmentLog.setMl_date(sdfdate.format(new Date()));
-                modooEquipmentLog.setMl_username(equipmentReturn.getEr_usercode());
-                modooEquipmentLogService.insertModooEquipmentLog(modooEquipmentLog);
-                //detail add enddate
+
                 ed.setEd_enddate(sdfdate2.format(new Date()));
                 equipmenteHireDetailService.updateEquipmenteHireDetail(ed);
             }

src/main/java/com/ygj/yuemum/service/equipment/EquipmenteHireHeadService.java

@@ -150,19 +150,19 @@ public class EquipmenteHireHeadService {
                 if (ed.getEt_type().equals("1")) {
                     //modoo active
                     modooApiService.equipmentActive(ed.getEd_emcode());
+                    // log
+                    ModooEquipmentLog modooEquipmentLog = new ModooEquipmentLog();
+                    modooEquipmentLog.setMl_type(1);
+                    modooEquipmentLog.setCm_phone(equipmenteHireHead.getEh_cmphone());
+                    modooEquipmentLog.setMl_code(ed.getEd_emcode());
+                    modooEquipmentLog.setMl_date(sdfdate.format(new Date()));
+                    modooEquipmentLog.setMl_username(equipmenteHireHead.getEh_usercode());
+                    modooEquipmentLogService.insertModooEquipmentLog(modooEquipmentLog);
                 }
                 EquipmentInfo equipmentInfo = new EquipmentInfo();
                 equipmentInfo.setEi_code(ed.getEd_emcode());
                 equipmentInfo.setEi_status(2);
                 equipmentInfoService.updateEIStatus(equipmentInfo);
-                // log
-                ModooEquipmentLog modooEquipmentLog = new ModooEquipmentLog();
-                modooEquipmentLog.setMl_type(1);
-                modooEquipmentLog.setCm_phone(equipmenteHireHead.getEh_cmphone());
-                modooEquipmentLog.setMl_code(ed.getEd_emcode());
-                modooEquipmentLog.setMl_date(sdfdate.format(new Date()));
-                modooEquipmentLog.setMl_username(equipmenteHireHead.getEh_usercode());
-                modooEquipmentLogService.insertModooEquipmentLog(modooEquipmentLog);
                 // add startdate
                 Calendar c=Calendar.getInstance();
                 c.add(Calendar.DATE, 4);
@@ -187,11 +187,10 @@ public class EquipmenteHireHeadService {
         return equipmenteHireHeadDao.updateEqorderStatus(equipmenteHireHead);
     }
 
-    public int addEquipmenteHireHeadOnline(EquipmenteHireHead equipmenteHireHead) {
+    public int updateEquipmenteHireHeadOnline (EquipmenteHireHead equipmenteHireHead) {
         try {
+            equipmenteHireHeadDao.updateEquipmenteHireHeadOnline(equipmenteHireHead);
             SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            equipmenteHireHeadDao.insertSelective(equipmenteHireHead);
-
             CustomerPay customerPay = new CustomerPay();
             customerPay.setCp_ordertype(1);
             customerPay.setCp_orderno(equipmenteHireHead.getEh_code());
@@ -200,8 +199,16 @@ public class EquipmenteHireHeadService {
             customerPay.setCp_discount(equipmenteHireHead.getCp_discount());
             customerPay.setCp_usercode("online");
             customerPay.setCp_date(sdfdate.format(new Date()));
-
             customerPayService.insertCustomerPayOnLine(customerPay);
+        }catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return 1;
+    }
+
+    public int addEquipmenteHireHeadOnline(EquipmenteHireHead equipmenteHireHead) {
+        try {
+            equipmenteHireHeadDao.insertSelective(equipmenteHireHead);
         } catch (Exception ex) {
             ex.printStackTrace();
             return 0;

src/main/java/com/ygj/yuemum/service/order/YSOrderService.java

@@ -351,7 +351,10 @@ public class YSOrderService {
     public int changMM (YSOrderServiceLog ysOrderServiceLog) {
         //解锁老月嫂库存，锁定新月嫂库存，修改老月嫂服务日志，新增新月嫂服务日志，更新订单服务月嫂
         try {
+            SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date tempstart = sdf2.parse(ysOrderServiceLog.getOd_startdate());
+            Date tempsend = sdf2.parse(ysOrderServiceLog.getOd_enddate());
             YSOrderServiceLog checkLog = new YSOrderServiceLog();
             checkLog.setOd_changeDate(sdf.format(new Date()));
             checkLog.setOd_no(ysOrderServiceLog.getOd_no());
@@ -367,15 +370,14 @@ public class YSOrderService {
                 MmStock mmStockNew = new MmStock();
                 mmStockNew.setServant_code(ysOrderServiceLog.getOd_mmid());
                 mmStockNew.setOrderno(ysOrderServiceLog.getOd_no());
-                mmStockNew.setStart_date(ysOrderServiceLog.getOd_startdate());
-                mmStockNew.setEnd_date(ysOrderServiceLog.getOd_enddate());
+                mmStockNew.setStart_date(sdf2.format(tempstart));
+                mmStockNew.setEnd_date(sdf2.format(tempsend));
                 mmStockNew.setStock_status(2);
                 mmStockDao.insertSelective(mmStockNew);
 
                 YSOrderServiceLog ysOrderServiceLogOld = new YSOrderServiceLog();
                 ysOrderServiceLogOld.setOd_no(ysOrderServiceLog.getOd_no());
                 ysOrderServiceLogOld.setOd_mmid(ysOrderServiceLog.getOd_mmidOld());
-                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
                 Date dt = sdf2.parse(ysOrderServiceLog.getOd_startdate());
                 Calendar rightNow = Calendar.getInstance();
                 rightNow.setTime(dt);

src/main/java/com/ygj/yuemum/service/wxmini/WXPromotionService.java

@@ -17,6 +17,9 @@ public class WXPromotionService {
     public List<WXPromotion> getPromotions() {
         return wxPromotionSDao.getPromotions();
     }
+    public List<WXPromotion> getIndexPromotions() {
+        return wxPromotionSDao.getIndexPromotions();
+    }
 
 
 }

src/main/java/com/ygj/yuemum/shiro/ShiroConfig.java

@@ -79,6 +79,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/insertYsOrderPay", "anon");
         filterChainDefinitionMap.put("/checkCustomerPay", "anon");
         filterChainDefinitionMap.put("/queryYSOrderReturn", "anon");
+        filterChainDefinitionMap.put("/updateEquipmenteHireHeadOnline", "anon");
+        filterChainDefinitionMap.put("/getIndexPromotions", "anon");
         //萌动开放权限
         filterChainDefinitionMap.put("/getNewUserCoupon", "anon");
         filterChainDefinitionMap.put("/getConsultTaskCoupon", "anon");

src/main/resources/application.yml

@@ -19,9 +19,9 @@ pagehelper:
   reasonable: true
   support-methods-arguments: true
   params: count=countSql
-logging:
-  level:
-     com.ygj.yuemum.dao : debug
+#logging:
+#  level:
+#     com.ygj.yuemum.dao : debug
 #优惠券批次号信息--------------------
 #测试
 coupon:

src/main/resources/mybatis/mapper/distributionchannel/DcIntroduceLogMapper.xml

@@ -37,8 +37,8 @@
 
     <select id="queryDcIntroduceLogs" resultType="com.ygj.yuemum.domain.distributionchannel.DcIntroduceLog"
             parameterType="com.ygj.yuemum.domain.distributionchannel.DcIntroduceLog">
-        select
-        id,
+        SELECT
+        dc_introduce_log.id,
         xul_openid,
         xul_phone,
         xul_event,
@@ -46,8 +46,10 @@
         xul_introducer_phone,
         xul_pm_type,
         xul_orderno,
+        ys_order.od_order_amount od_order_amount,
         xul_rebateamount
-        from dc_introduce_log
+        FROM
+        dc_introduce_log LEFT JOIN ys_order ON dc_introduce_log.xul_orderno = ys_order.od_no
         where 1=1
         <if test="xul_openid != null and xul_openid != ''">
             and xul_openid = #{xul_openid,jdbcType=VARCHAR}
@@ -84,6 +86,7 @@
         xul_introducer_phone,
         xul_pm_type,
         xul_orderno,
+        tb.od_order_amount,
         ifnull(tb.od_rebate_amount,0) od_rebate_amount
         FROM
         dc_introduce_log ta

src/main/resources/mybatis/mapper/equipment/EquipmenteHireHeadMapper.xml

@@ -33,9 +33,7 @@
             eh_source
         FROM
             equipment_hire_head
-        order by eh_date desc ,
-        eh_status asc,
-        id desc
+        order by id desc
     </select>
 
     <select id="getSeq" resultType="java.lang.Integer" >
@@ -108,10 +106,7 @@
                     and equipment_hire_detail.ed_enddate = #{ed_enddate,jdbcType=DATE}
                 </if>
         )
-        ORDER BY
-        equipment_hire_head.eh_date desc,
-        equipment_hire_head.eh_status ASC,
-        equipment_hire_head.id desc
+        ORDER BY equipment_hire_head.id desc
     </select>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -255,4 +250,14 @@
         </set>
         where eh_code = #{eh_code,jdbcType=INTEGER}
     </update>
+
+    <update id="updateEquipmenteHireHeadOnline" parameterType="com.ygj.yuemum.domain.equipment.EquipmenteHireHead" >
+        update equipment_hire_head
+        <set >
+            <if test="eh_status != null" >
+                eh_status = 2
+            </if>
+        </set>
+        where eh_code = #{eh_code,jdbcType=INTEGER}
+    </update>
 </mapper>

src/main/resources/mybatis/mapper/global/PackagesMapper.xml

@@ -41,7 +41,7 @@
     </select>
 
     <select id="getPackageLists" resultType="com.ygj.yuemum.domain.global.Packages" >
-        select p_code,p_name,p_days,p_amount,p_listimg,p_listdesc
+        select *
         from packages
         where p_type = '1'
         order by p_seq asc

src/main/resources/mybatis/mapper/order/YSOrderServiceLog.xml

@@ -68,7 +68,7 @@
         od_no,
         od_mmid,
         fgetmmname (od_mmid) od_mmname,
-        DATE_FORMAT(od_startdate,'%Y-%m-%d') od_startdate,
+        DATE_FORMAT(od_startdate,'%Y-%m-%d %H:%i:%S') od_startdate,
         DATE_FORMAT(od_enddate,'%Y-%m-%d') od_enddate,
         od_type,
         od_comment,

src/main/resources/mybatis/mapper/wxmini/WXPromotionMapper.xml

@@ -7,6 +7,7 @@
         <result column="wp_name" property="wp_name" jdbcType="VARCHAR" />
         <result column="wp_desc" property="wp_desc" jdbcType="VARCHAR" />
         <result column="wp_url" property="wp_url" jdbcType="VARCHAR" />
+        <result column="wp_index_url" property="wp_index_url" jdbcType="VARCHAR" />
         <result column="wp_href" property="wp_href" jdbcType="VARCHAR" />
         <result column="wp_startdate" property="wp_startdate" jdbcType="DATE" />
         <result column="wp_enddate" property="wp_enddate" jdbcType="DATE" />
@@ -25,9 +26,21 @@
         if(TO_DAYS(NOW()) - TO_DAYS(wp_enddate) &lt;= 0,'Y','N') wp_isexpire
         FROM
         wx_promotion
+        ORDER BY
+        id DESC
+    </select>
 
+    <select id="getIndexPromotions" resultType="com.ygj.yuemum.domain.wxmini.WXPromotion" >
+        SELECT
+        *
+        FROM
+        wx_promotion
+        WHERE
+        DATE_FORMAT(now(), '%Y-%m-%d') &gt;= DATE_FORMAT(wp_startdate, '%Y-%m-%d')
+        AND DATE_FORMAT(now(), '%Y-%m-%d') &lt;= DATE_FORMAT(wp_enddate, '%Y-%m-%d')
         ORDER BY
         id DESC
+        LIMIT 6
     </select>
 
 </mapper>