上架费bugfix

src/main/java/com/caimei/modules/coupon/service/AsyncService.java

@@ -6,6 +6,7 @@ import com.caimei.modules.user.dao.MessageCenterDao;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.modules.user.entity.MessageCenter;
 import com.caimei.po.User;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
@@ -20,6 +21,7 @@ import java.util.List;
 @Service
 @EnableAsync
 @Transactional(readOnly = false)
+@Slf4j
 public class AsyncService {
 
     @Resource
@@ -28,6 +30,7 @@ public class AsyncService {
     //优惠券站内消息推送
     @Async("mytask")
     public void consumer(CmCoupon cmCoupon) {
+        log.info("优惠券异步信推送开始--------------------》");
         String smsContent = "采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，众多大牌正品等着您，快戳采美网站链接www.caimei365.com" +
                 "或微信搜索“采美采购商城”小程序登录采美平台领取下单吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
         MessageCenter messageCenter = new MessageCenter();

src/main/java/com/caimei/modules/sys/utils/SMSUtils.java

@@ -2,6 +2,7 @@ package com.caimei.modules.sys.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.thinkgem.jeesite.common.config.Global;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
@@ -9,6 +10,7 @@ import org.springframework.web.client.RestTemplate;
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
 public class SMSUtils {
 
     /**
@@ -73,8 +75,10 @@ public class SMSUtils {
             String result = restTemplate.postForObject(uri, paramMap, String.class);
             JSONObject json = (JSONObject) JSONObject.parse(result);
             if (null != json && json.getInteger("code") == 0) {
+                log.info("短信发送成功------------------->" + mobile + "内容---------------->" + content);
                 return true;
             } else {
+                log.error("短信发送失败---------------->" + result);
                 return false;
             }
         }

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -113,30 +113,30 @@ public class NewCmShopController extends BaseController {
         newCmShop.setShopType(2);
         Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
         model.addAttribute("page", page);
-        model.addAttribute("newCmShop",newCmShop);
-        model.addAttribute("shopType",2);
+        model.addAttribute("newCmShop", newCmShop);
+        model.addAttribute("shopType", 2);
         return "modules/user/cmNewProductShopList";
     }
 
     @RequestMapping(value = "/special/new/edit")
     public String specialEdit(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
-        if(null!=newCmShop.getShopID()){
+        if (null != newCmShop.getShopID()) {
             newCmShop.setSplitCodes(newCmShopDao.findSplitCode(newCmShop.getShopID()));
         }
-        model.addAttribute("newCmShop",newCmShop);
+        model.addAttribute("newCmShop", newCmShop);
         return "modules/user/cmNewProductShopEdit";
     }
 
     @RequestMapping(value = "/special/new/save")
     public String specialSave(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
         newCmShopService.saveSpecial(newCmShop);
-        if(2==newCmShop.getShopType()){
-            model.addAttribute("newCmShop",newCmShop);
-            model.addAttribute("shopType",2);
+        if (2 == newCmShop.getShopType()) {
+            model.addAttribute("newCmShop", newCmShop);
+            model.addAttribute("shopType", 2);
             return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
-        }else{
-            model.addAttribute("newCmShop",newCmShop);
-            model.addAttribute("shopType",3);
+        } else {
+            model.addAttribute("newCmShop", newCmShop);
+            model.addAttribute("shopType", 3);
             return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
         }
     }
@@ -145,11 +145,11 @@ public class NewCmShopController extends BaseController {
     public String specialOffline(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
         //下线
         newCmShopService.offline(newCmShop);
-        if(2==newCmShop.getShopType()){
-            model.addAttribute("shopType",2);
+        if (2 == newCmShop.getShopType()) {
+            model.addAttribute("shopType", 2);
             return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
-        }else{
-            model.addAttribute("shopType",3);
+        } else {
+            model.addAttribute("shopType", 3);
             return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
         }
     }
@@ -158,11 +158,11 @@ public class NewCmShopController extends BaseController {
     public String specialOnline(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
         //上线
         newCmShopService.online(newCmShop);
-        if(2==newCmShop.getShopType()){
-            model.addAttribute("shopType",2);
+        if (2 == newCmShop.getShopType()) {
+            model.addAttribute("shopType", 2);
             return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
-        }else{
-            model.addAttribute("shopType",3);
+        } else {
+            model.addAttribute("shopType", 3);
             return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
         }
     }
@@ -173,8 +173,8 @@ public class NewCmShopController extends BaseController {
         newCmShop.setShopType(3);
         Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
         model.addAttribute("page", page);
-        model.addAttribute("shopType",3);
-        model.addAttribute("newCmShop",newCmShop);
+        model.addAttribute("shopType", 3);
+        model.addAttribute("newCmShop", newCmShop);
         return "modules/user/cmNewProductShopList";
     }
 
@@ -190,93 +190,14 @@ public class NewCmShopController extends BaseController {
 
     @RequestMapping(value = "maintenanceList")
     public String maintenanceList(CmDiscernReceipt cmDiscernReceipt, HttpServletRequest request, HttpServletResponse response, Model model) throws ParseException {
-        //获取供应商证书信息
-        Page<CmDiscernReceipt>discernReceipt = newCmShopService.maintenanceList(new Page<CmDiscernReceipt>(request, response, 20),cmDiscernReceipt);
-        String date="";
-        int num=0;
-
-
-        Date currentTime = new Date();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Calendar calendar = Calendar.getInstance();
-        Calendar calendars = Calendar.getInstance();
-        //当前时间
-        String dateString = formatter.format(currentTime);
-        //到期时间
-        String dateStrings ="";
-        //生效时间
-        String validityDate="";
-        for(int i=0;i<discernReceipt.getList().size();i++){
-            CmDiscernReceipt cmDiscern=  newCmShopService.cmrectiptlist(discernReceipt.getList().get(i).getShopID());
-            //缴纳时间
-            String receiptDate=discernReceipt.getList().get(i).getReceiptDate();
-            if(!receiptDate.contains(":")){
-                receiptDate+=" 00:00:01";
-            }
-            Date receipttime = formatter.parse(receiptDate);
-//如果没有缴费记录
-            if(null==cmDiscern){
-                //缴纳时间加一年==到期时间
-                calendar.setTime(receipttime);
-                calendar.add(Calendar.YEAR, 1);
-                dateStrings= formatter.format(calendar.getTime());
-                calendars.setTime(receipttime);
-                calendars.add(Calendar.DATE, 1);
-                validityDate= formatter.format(calendars.getTime());
-                cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
-                logger.info("getReceiptID>>>>>"+discernReceipt.getList().get(i).getReceiptID());
-                cmDiscernReceipt.setValidityDate(receiptDate);
-                logger.info("receiptDate>>>>>"+receiptDate);
-                cmDiscernReceipt.setExpirationDate(dateStrings);
-                logger.info("dateStrings>>>>>"+dateStrings);
-                newCmShopService.cmreceipt(cmDiscernReceipt);
-            }
-            if(null!=cmDiscern && cmDiscern.getReceStatct()!=2 && cmDiscern.getReceStatct()!=1) {
-                Integer count=newCmShopService.cmrectCount(discernReceipt.getList().get(i).getShopID());
-                System.out.println("count>>"+count+"size>>"+discernReceipt.getList().size());
-                String receipt=cmDiscern.getExpirationDate();
-                if(!receipt.contains(":")){
-                    receipt+=" 00:00:01";
-                }
-                calendars.setTime(receipttime);
-                calendars.add(Calendar.DATE, -1);
-                String letdele= formatter.format(calendars.getTime());
-                Date rece = formatter.parse(receipt);
-                calendar.setTime(rece);
-                calendar.add(Calendar.YEAR, 1);
-                dateStrings= formatter.format(calendar.getTime());
-                if(!cmDiscern.getReceiptID().equals(discernReceipt.getList().get(i).getReceiptID())){
-                    if(count != discernReceipt.getList().size()){
-                        num = receipt.compareTo(dateString);
-                        logger.info(">>>>>>"+num);
-                        if(num>0){
-                            cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
-                            cmDiscernReceipt.setValidityDate(cmDiscern.getExpirationDate());
-                            cmDiscernReceipt.setExpirationDate(dateStrings);
-                            newCmShopService.cmreceipt(cmDiscernReceipt);
-                        } else {
-                            cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
-                            cmDiscernReceipt.setValidityDate(validityDate);
-                            cmDiscernReceipt.setExpirationDate(dateStrings);
-                            newCmShopService.cmreceipt(cmDiscernReceipt);
-                        }
-                    }
-                }
-            }
-
-            cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
-            cmDiscernReceipt.setLinkMan(discernReceipt.getList().get(i).getLinkMan());
-            System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+num);
-            System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+"1:"+date+"2:"+dateStrings+"3:"+dateString);
-        }
-        Page<CmDiscernReceipt>discernReceip = newCmShopService.maintenanceList(new Page<CmDiscernReceipt>(request, response, 20),cmDiscernReceipt);
-            model.addAttribute("CmDiscernReceipt", cmDiscernReceipt);
+        Page<CmDiscernReceipt> discernReceip = newCmShopService.maintenanceList(new Page<CmDiscernReceipt>(request, response, 20), cmDiscernReceipt);
+        model.addAttribute("CmDiscernReceipt", cmDiscernReceipt);
         model.addAttribute("discernReceipt", discernReceip);
         return "modules/user/maintenanceList";
     }
 
     @RequestMapping(value = "Removethelastfee")
-    public String Removethelastfee(CmDiscernReceipt cmDiscernReceipt,Model model) {
+    public String Removethelastfee(CmDiscernReceipt cmDiscernReceipt, Model model) {
         CmOperationalLogs sysLog = new CmOperationalLogs();
         Date currentTime = new Date();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@@ -286,7 +207,6 @@ public class NewCmShopController extends BaseController {
         //获取操作时间
         sysLog.setOperationtime(new Date());
         newCmShopService.addthelast(cmDiscernReceipt);
-        cmDiscernReceipt.setReceiptID(newCmShopService.therectip().toString());
         newCmShopService.cmreceipt(cmDiscernReceipt);
 
         //获取操作员
@@ -302,18 +222,16 @@ public class NewCmShopController extends BaseController {
             if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
                 int i = cmOperationalLogService.insert(sysLog);
             }
-
         }
-        return "redirect:" + Global.getAdminPath() + "/user/newCmShop/maintenanceList?shopID="+cmDiscernReceipt.getShopID()+"&shopName"+cmDiscernReceipt.getShopName();
+        return "redirect:" + Global.getAdminPath() + "/user/newCmShop/maintenanceList?shopID=" + cmDiscernReceipt.getShopID() + "&shopName" + cmDiscernReceipt.getShopName();
     }
+
     @RequestMapping(value = "Removethelast")
-    public String Removethelast(CmDiscernReceipt cmDiscernReceipt,Model model)
-    {
+    public String Removethelast(CmDiscernReceipt cmDiscernReceipt, Model model) {
         CmOperationalLogs sysLog = new CmOperationalLogs();
         newCmShopService.Removethelast(cmDiscernReceipt);
         //获取操作时间
         sysLog.setOperationtime(new Date());
-
         //获取操作员
         SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
         System.out.println("操作员" + principal.getName());
@@ -327,10 +245,8 @@ public class NewCmShopController extends BaseController {
             if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
                 int i = cmOperationalLogService.insert(sysLog);
             }
-
         }
-
-        return "redirect:" + Global.getAdminPath() + "/user/newCmShop/maintenanceList?shopID="+cmDiscernReceipt.getShopID()+"&shopName"+cmDiscernReceipt.getShopName();
+        return "redirect:" + Global.getAdminPath() + "/user/newCmShop/maintenanceList?shopID=" + cmDiscernReceipt.getShopID() + "&shopName" + cmDiscernReceipt.getShopName();
     }
 
     /**
@@ -401,7 +317,7 @@ public class NewCmShopController extends BaseController {
                 sysLog.setContact(newCmShops.getLinkMan());
                 sysLog.setInstitutionName(newCmShops.getName());
                 sysLog.setOperationtype("审核");
-                    sysLog.setActioncontent("审核失败");
+                sysLog.setActioncontent("审核失败");
                 if (!"".equals(sysLog.getActioncontent())) {
                     if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
                         int i = cmOperationalLogService.insert(sysLog);
@@ -419,14 +335,13 @@ public class NewCmShopController extends BaseController {
 
                     String pagePath = "/pages/login/apply-supplier";
                     for (String openid : openidList) {
-                        weChatService.sendTemplate(accessToken, openid,newCmShops.getName(),auditNote,auditTime, pagePath);
+                        weChatService.sendTemplate(accessToken, openid, newCmShops.getName(), auditNote, auditTime, pagePath);
                     }
                 } catch (Exception e) {
                     logger.error("【供应商审核失败通知】获取微信公众号access_token异常！", e);
                 }
 
 
-
             }
             // 更新用户信息
             newCmShopService.updateUserAudit(auditStatus, auditNote, format, manufacturerStatus, userId, "1");
@@ -438,10 +353,10 @@ public class NewCmShopController extends BaseController {
             map.put("msg", "审核成功");
             if (StringUtils.isNotEmpty(mobile)) {
                 boolean sendSms = newOrderService.getSendSms(9, mobile, smsMessage);
-                if(sendSms){
+                if (sendSms) {
                     logger.info(">>>>>>>获得供应商账户审核短信推送成功");
-                }else {
-                    SMSUtils.sendSms(0,mobile, smsMessage);
+                } else {
+                    SMSUtils.sendSms(0, mobile, smsMessage);
                 }
             }
         } catch (Exception e) {
@@ -449,7 +364,6 @@ public class NewCmShopController extends BaseController {
             logger.error(e.getMessage());
 
 
-
             map.put("success", false);
             map.put("msg", "审核失败");
         }
@@ -672,7 +586,7 @@ public class NewCmShopController extends BaseController {
                 cmUser.setBindMobile(mobile);
                 cmUserService.update(cmUser);
                 String content = "供应商企业账号绑定手机号已修改成功，可使用当前手机号进行密码修改等操作。";
-                SMSUtils.sendSms(0,mobile, content);
+                SMSUtils.sendSms(0, mobile, content);
 
                 map.put("success", true);
                 map.put("msg", "修改成功");
@@ -698,7 +612,7 @@ public class NewCmShopController extends BaseController {
     @RequiresPermissions("user:newCmShop:edit")
     public String onLine(NewCmShop newCmShop, Model model, RedirectAttributes redirectAttributes) {
         Integer userID = newCmShop.getUserID();
-        NewCmShop newCmShops= cmOperationalLogService.userlist(userID);
+        NewCmShop newCmShops = cmOperationalLogService.userlist(userID);
         CmOperationalLogs sysLog = new CmOperationalLogs();
         cmUserService.updateUserStatus("90", userID, "1");
         newCmShopService.updateShopStatus("90", userID);
@@ -734,9 +648,9 @@ public class NewCmShopController extends BaseController {
     @RequestMapping(value = "offline")
     @RequiresPermissions("user:newCmShop:edit")
     public String offLine(NewCmShop newCmShop, Model model, RedirectAttributes redirectAttributes) {
-        System.out.println(">>>>>>>>>>>>>>》》》》》"+newCmShop);
+        System.out.println(">>>>>>>>>>>>>>》》》》》" + newCmShop);
         Integer userID = newCmShop.getUserID();
-        NewCmShop newCmShops= cmOperationalLogService.userlist(userID);
+        NewCmShop newCmShops = cmOperationalLogService.userlist(userID);
         cmUserService.updateUserStatus("91", userID, "0");
         newCmShopService.updateShopStatus("91", userID);
         addMessage(redirectAttributes, "供应商下线成功");
@@ -857,7 +771,7 @@ public class NewCmShopController extends BaseController {
             }
         }
         if (newCmShops.getRegisteredCapital() != null) {
-            if (!newCmShop.getRegisteredCapital().equals(newCmShops.getRegisteredCapital()) ) {
+            if (!newCmShop.getRegisteredCapital().equals(newCmShops.getRegisteredCapital())) {
                 list.add("修改了注册资本");
             }
         }
@@ -907,7 +821,7 @@ public class NewCmShopController extends BaseController {
             }
         }
 
-         if (!newCmShop.getBusinessScope().equals(newCmShops.getBusinessScope())) {
+        if (!newCmShop.getBusinessScope().equals(newCmShops.getBusinessScope())) {
             list.add("修改了医疗类型");
         }
 
@@ -924,7 +838,7 @@ public class NewCmShopController extends BaseController {
                 list.add("新增了微信公众号");
             }
         }
-            if (!newCmShop.getWxOfficialAccount().equals(newCmShops.getWxOfficialAccount())) {
+        if (!newCmShop.getWxOfficialAccount().equals(newCmShops.getWxOfficialAccount())) {
             list.add("修改了微信公众号");
         }
 
@@ -941,7 +855,7 @@ public class NewCmShopController extends BaseController {
                 list.add("新增了营业执照编号");
             }
         }
-      if (!newCmShop.getSocialCreditCode().equals(newCmShops.getSocialCreditCode())) {
+        if (!newCmShop.getSocialCreditCode().equals(newCmShops.getSocialCreditCode())) {
             list.add("修改了营业执照编号");
         }
 
@@ -981,7 +895,6 @@ public class NewCmShopController extends BaseController {
         }
 
 
-
         if (!beanValidator(model, newCmShop)) {
             return form(newCmShop, model);
         }
@@ -1028,8 +941,9 @@ public class NewCmShopController extends BaseController {
             if (StringUtils.isEmpty(cmShop.getSecondShopType())) {
                 return jsonModel.error("请选择二级分类");
             } else {
-                if ("3".equals(cmShop.getSecondShopType()) && StringUtils.isEmpty(cmShop.getMedicalPracticeLicenseImg1())){
-                    return jsonModel.error("请上传资质");}
+                if ("3".equals(cmShop.getSecondShopType()) && StringUtils.isEmpty(cmShop.getMedicalPracticeLicenseImg1())) {
+                    return jsonModel.error("请上传资质");
+                }
             }
             dbShop.setSecondShopType(cmShop.getSecondShopType());
             dbShop.setMedicalPracticeLicenseImg1(cmShop.getMedicalPracticeLicenseImg1());

src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -442,7 +442,8 @@
 
     <select id="maintenanceList" resultType="CmDiscernReceipt">
         SELECT
-        c.validityDate as validityDate, c.dateStrings as expirationDate,a.id as receiptID,a.shopID,a.receiptAmount,a.receiptDate,a.receStatct,s.linkMan
+        c.validityDate as validityDate, c.dateStrings as expirationDate,a.id as
+        receiptID,a.shopID,a.receiptAmount,a.receiptDate,a.receStatct,s.linkMan
         FROM cm_discern_receipt a
         LEFT JOIN shop s ON s.shopID = a.shopID
         LEFT JOIN cm_receipt c ON c.receiptID = a.id
@@ -471,7 +472,9 @@
     </insert>
 
     <select id="therectip" resultType="Integer">
-        SELECT id FROM cm_discern_receipt WHERE receStatct=2
+        SELECT id
+        FROM cm_discern_receipt
+        WHERE receStatct = 2
         ORDER BY id DESC
         LIMIT 1
     </select>
@@ -484,11 +487,11 @@
         where id = #{receiptID}
     </update>
 
-    <insert id="addthelast">
+    <insert id="addthelast" keyColumn="id" keyProperty="receiptID" useGeneratedKeys="true">
         insert cm_discern_receipt
-       (receiptDate,newReceiptType,
-            receStatct,delFlag,shopID)
-            value (now(),1,2,1,#{shopID})
+        (receiptDate, confirmDate, reviewDate, updateDate, newReceiptType,
+         receStatct, delFlag, shopID)
+            value (now(), now(), now(), now(), 1, 2, 1, #{shopID})
     </insert>
 
     <insert id="cmreceipt">
@@ -498,8 +501,10 @@
     </insert>
 
     <select id="cmrectiptlist" resultType="com.caimei.modules.order.entity.CmDiscernReceipt">
-        SELECT r.receiptID as receiptID,r.dateStrings  as expirationDate,
-               r.validityDate as validityDate,c.receStatct AS receStatct
+        SELECT r.receiptID    as receiptID,
+               r.dateStrings  as expirationDate,
+               r.validityDate as validityDate,
+               c.receStatct   AS receStatct
         FROM cm_receipt r
                  LEFT JOIN cm_discern_receipt c ON c.id = r.receiptID
                  LEFT JOIN shop s ON s.shopID = c.shopID