bugfix

src/main/java/com/caimei/modules/brand/web/CmBrandController.java

@@ -129,7 +129,7 @@ public class CmBrandController extends BaseController {
                     if (StringUtils.equals("1", status)) {
                         String mobile = cmBrand.getShopMobile();
                         if (StringUtils.isNotEmpty(mobile)) {
-                            SMSUtils.sendSms(mobile, "您提交的[" + cmBrand.getName() + "]品牌申请，已审核成功");
+                            SMSUtils.sendSms(0,mobile, "您提交的[" + cmBrand.getName() + "]品牌申请，已审核成功");
                         }
                     }
                     if (StringUtils.equals("2", status)) {
@@ -140,7 +140,7 @@ public class CmBrandController extends BaseController {
                         }
                         String mobile = cmBrand.getShopMobile();
                         if (StringUtils.isNotEmpty(mobile)) {
-                            SMSUtils.sendSms(mobile, "抱歉，您提交的[" + cmBrand.getName() + "]品牌申请，由于" + cmBrand.getAuditNote() + "审核失败，请重新修改提交！");
+                            SMSUtils.sendSms(0,mobile, "抱歉，您提交的[" + cmBrand.getName() + "]品牌申请，由于" + cmBrand.getAuditNote() + "审核失败，请重新修改提交！");
                         }
                     }
                 } else {

src/main/java/com/caimei/modules/coupon/web/CmCouponController.java

@@ -203,7 +203,7 @@ public class CmCouponController extends BaseController {
                                         String content = "采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，众多大牌正品等着您，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取下单吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                         boolean sendSms = false;
                                         try {
-                                            sendSms = SMSUtils.sendSms(user.getBindMobile(), content);
+                                            sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }
@@ -238,7 +238,7 @@ public class CmCouponController extends BaseController {
                                         String content = "采美平台" + catego + "类商品大优惠，采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                         boolean sendSms = false;
                                         try {
-                                            sendSms = SMSUtils.sendSms(user.getBindMobile(), content);
+                                            sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }
@@ -265,10 +265,9 @@ public class CmCouponController extends BaseController {
                                 }
                                 if ("90".equals(user.getClubStatus()) && coumt == 0 && 3 == cmCoupon.getCouponType()) {
                                     CmCoupon coupon = messageCenterDao.CouponList(3);//查询店铺优惠券信息
-                                    if (coupon.getShopId() != null) {
                                         String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
                                         String shopName = messageCenterDao.shopName(cmCoupon.getShopId());
-                                        Integer userID = messageCenterDao.userID(coupon.getShopId());
+                                        Integer userID = messageCenterDao.userID(cmCoupon.getShopId());
                                         Integer clubID = messageCenterDao.clubIdCule(userID);
                                         MessageCenter messageCenter = new MessageCenter();
                                         messageCenter.setShopId(null);
@@ -284,14 +283,13 @@ public class CmCouponController extends BaseController {
                                         String content = "采美平台为了回馈客户，赠送您" + cmCoupon.getCouponAmount() + "元的店铺专属优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                         boolean sendSms = false;
                                         try {
-                                            sendSms = SMSUtils.sendSms(user.getBindMobile(), content);
+                                            sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }
                                         if (sendSms) {
                                             logger.info(">>>>>>>发送成功");
                                         }
-                                    }
                                     jedis.del("mess" + clubIdc);
                                     coumt++;
                                 }
@@ -328,7 +326,7 @@ public class CmCouponController extends BaseController {
                                             String content = "恭喜成功注册采美平台。采美平台赠送您" + cmCoupon.getCouponAmount() + "元新用户优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                             boolean sendSms = false;
                                             try {
-                                                sendSms = SMSUtils.sendSms(user.getBindMobile(), content);
+                                                sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
                                             } catch (Exception e) {
                                                 e.printStackTrace();
                                             }
@@ -380,7 +378,8 @@ public class CmCouponController extends BaseController {
             String content = "为了答谢您对采美平台的支持，采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
             boolean sendSms = false;
             try {
-                sendSms =  SMSUtils.sendSms( user.getBindMobile(), content);
+                sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
+//                sendSms =  SMSUtils.sendSms( user.getBindMobile(), content);
             } catch (Exception e) {
                 e.printStackTrace();
             }

src/main/java/com/caimei/modules/hehe/service/CmHeheCollageService.java

@@ -29,11 +29,11 @@ public class CmHeheCollageService extends CrudService<CmHeheCollageDao, CmHeheCo
 	public CmHeheCollage get(String id) {
 		return super.get(id);
 	}
-	
+
 	public List<CmHeheCollage> findList(CmHeheCollage cmHeheCollage) {
 		return super.findList(cmHeheCollage);
 	}
-	
+
 	public Page<CmHeheCollage> findPage(Page<CmHeheCollage> page, CmHeheCollage cmHeheCollage) {
 		Page<CmHeheCollage> collagePage = super.findPage(page, cmHeheCollage);
 		List<CmHeheCollage> collageList = collagePage.getList();
@@ -44,12 +44,12 @@ public class CmHeheCollageService extends CrudService<CmHeheCollageDao, CmHeheCo
 		});
 		return collagePage;
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void save(CmHeheCollage cmHeheCollage) {
 		super.save(cmHeheCollage);
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void delete(CmHeheCollage cmHeheCollage) {
 		super.delete(cmHeheCollage);
@@ -69,11 +69,11 @@ public class CmHeheCollageService extends CrudService<CmHeheCollageDao, CmHeheCo
 		// 已支付订单手机号
 		List<String> mobileList = cmHeheCollageDao.getMobilesByCollageId(collageId);
 		// 拼团成功短信推送
-		mobileList.forEach(mobile-> SMSUtils.sendSms(mobile, "您的商品已拼团成功，请赶紧登录颜选美学小程序查看订单吧。"));
+		mobileList.forEach(mobile-> SMSUtils.sendSms(0,mobile, "您的商品已拼团成功，请赶紧登录颜选美学小程序查看订单吧。"));
 		// 关闭其它未支付拼团订单
 		List<Integer> orderIdList = cmHeheCollageDao.findNoPayCollageOrderIds(collageId);
 		orderIdList.forEach(noPayOrderId->{
 			cmHeheCollageDao.cancelOrder(noPayOrderId, "拼团自动完成关闭其它未支付拼团订单");
 		});
     }
-}
+}

src/main/java/com/caimei/modules/newhome/service/CmInstrumentMaintenanceService.java

@@ -123,15 +123,15 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
                             "，已为您对接到维修用户" + cmInstrumentMaintenance.getUserContact() +
                             "，联系电话" + cmInstrumentMaintenance.getUserMobile() + "，点击"+ msgLink.replace("$", repairerLink.getLinkCode()) +"，查看维修详情，请注意保存此短信，方便后续查看进展，采美客服0755-22907771";
 
-                    SMSUtils.sendSms(cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
-                    SMSUtils.sendSms(cmInstrumentMaintenance.getMaintainerMobile().toString(), msgRepairer);
+                    SMSUtils.sendSms(0,cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
+                    SMSUtils.sendSms(0,cmInstrumentMaintenance.getMaintainerMobile().toString(), msgRepairer);
                     cmInstrumentMaintenance.setStatus("2");
                     cmInstrumentMaintenance.setDockingDate(new Date());
                 } else if (isFirstConfirm && cmInstrumentMaintenance.getMaintainerMobile() == null) { //只是核实了信息 没有填写供应商信息
                     String msgCustomer = cmInstrumentMaintenance.getUserContact() +
                             "，您的维修申请已确认，我们将在1-2个工作日为您安排维修服务，点击" + msgLink.replace("$", customerLink) + "，查看后续维修进展，采美客服0755-22907771"; //发送核实短信
 
-                    SMSUtils.sendSms(cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
+                    SMSUtils.sendSms(0,cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
                 } else if ("1".equals(dbbean.getAuthenticity()) && isFirstConnRepairer) { //已经核实信息了, 现在新加了维修商信息
                     CmInstrumentMaintenanceLinks repairerLink = new CmInstrumentMaintenanceLinks();
                     repairerLink.setType("3");
@@ -149,8 +149,8 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
                             "，点击" + msgLink.replace("$", repairerLink.getLinkCode()) +"，查看维修详情，请注意保存此短信，方便后续查看进展，采美客服0755-22907771";
                     cmInstrumentMaintenance.setStatus("2");
                     cmInstrumentMaintenance.setDockingDate(new Date());
-                    SMSUtils.sendSms(cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
-                    SMSUtils.sendSms(cmInstrumentMaintenance.getMaintainerMobile().toString(), msgRepairer);
+                    SMSUtils.sendSms(0,cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
+                    SMSUtils.sendSms(0,cmInstrumentMaintenance.getMaintainerMobile().toString(), msgRepairer);
                 }
             }
         }
@@ -171,8 +171,8 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
                         "，已为您对接到维修用户" + cmInstrumentMaintenance.getUserContact() +
                         "，联系电话" + cmInstrumentMaintenance.getUserMobile() +
                         "，点击" + msgLink.replace("$", str) +"，查看维修详情，请注意保存此短信，方便后续查看进展，采美客服0755-22907771";
-                SMSUtils.sendSms(cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
-                SMSUtils.sendSms(cmInstrumentMaintenance.getMaintainerMobile().toString(), msgRepairer);
+                SMSUtils.sendSms(0,cmInstrumentMaintenance.getUserMobile().toString(), msgCustomer);
+                SMSUtils.sendSms(0,cmInstrumentMaintenance.getMaintainerMobile().toString(), msgRepairer);
             }
         }
         cmInstrumentMaintenanceDao.update(cmInstrumentMaintenance);
@@ -186,4 +186,4 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
     public CmInstrumentMaintenanceLinks getShareLinkCode(String id, String type) {
         return cmInstrumentMaintenanceLinksDao.getShareLinkCode(id, type);
     }
-}
+}

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

@@ -7,22 +7,55 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 public class SMSUtils {
+
+	/** key */
+	private static final String ACCOUNT = "account";
+	private static final String PASSWORD = "password";
+	/** 通知短信 账户 */
+	private static final String ACCOUNT_NOTICE = "N2532063";
+	private static final String PASSWORD_NOTICE = "jzVvYmuP4D7f1b";
+	/** 验证码短信 账户 */
+	private static final String ACCOUNT_YZM = "YZM6372171";
+	private static final String PASSWORD_YZM = "1L8ZaIEW7fa3ca";
+	/** 营销短信 账户 */
+	private static final String ACCOUNT_ADS = "M1666161";
+	private static final String PASSWORD_ADS = "TO3xSGvEUk6ddc";
+	/** 请求地址 */
+	private static final String SMS_URL = "http://smssh1.253.com/msg/send/json";
+
+
 //	private static String url = "http://47.96.109.82:9999/sms.aspx";
 //	private static String userid = "321";
 //	private static String account = "0755cmxx";
 //	private static String password = "CaimeiSMS999";
-	
-	public static boolean sendSms(String mobile, String content){
+
+	public static boolean sendSms(Integer type,String mobile, String content){
 
 //		String res = SmsClientSend.sendSms(url, userid, account, password, mobile, content);
 //		return res.indexOf("Success") != -1;
 
+//		JSONObject params = new JSONObject();
+//		if (null != type && 2 == type) {
+//			// 验证码短信
+//			params.put(ACCOUNT, ACCOUNT_YZM);
+//			params.put(PASSWORD, PASSWORD_YZM);
+//		} else if (null != type && 3 == type) {
+//			// 营销短信
+//			params.put(ACCOUNT, ACCOUNT_ADS);
+//			params.put(PASSWORD, PASSWORD_ADS);
+//		} else {
+//			// 通知短信
+//			params.put(ACCOUNT, ACCOUNT_NOTICE);
+//			params.put(PASSWORD, PASSWORD_NOTICE);
+//		}
+
 		// 获取core服务器地址
 		String coreServer = Global.getConfig("caimei.core");
 		RestTemplate restTemplate = new RestTemplate();
 		String uri = coreServer + "/tools/sms/send";
 		// 发起Post请求
 		MultiValueMap<String, String> paramMap = new LinkedMultiValueMap<>();
+		paramMap.add("type", type.toString());
 		paramMap.add("mobile", mobile);
 		paramMap.add("content", content);
 		String result = restTemplate.postForObject(uri, paramMap, String.class);
@@ -36,7 +69,8 @@ public class SMSUtils {
 	}
 
 	public static void main(String[] args) {
-		//System.out.println(sendSms("13631650502", "您登录亲朋棋牌的手机短 信验证码是：7895，祝您游戏愉快！请确认账号是由本人操作"));
-		// System.out.println(sendSms("15814011616", "您短信验证码是：7895"));
+//		String e="abc";
+//		System.out.println(sendSms(3,"1817515644", "【采美365】 尊敬的采美供应商用户，您在采美上架的商品“" + e + "”资质证书将于3个月后失效，请及时登录采美网站上传新证书。"));
+//		 System.out.println(sendSms("18175515644", "您短信验证码是：7895"));
 	}
 }

src/main/java/com/caimei/modules/sys/web/NotificationController.java

@@ -9,6 +9,7 @@ import com.caimei.modules.product.entity.Product;
 import com.caimei.modules.sys.dao.NotificationDao;
 import com.caimei.modules.sys.entity.Notification;
 import com.caimei.modules.sys.service.NotificationService;
+import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.user.dao.MessageCenterDao;
 import com.caimei.modules.user.entity.MessageCenter;
 import com.caimei.utils.StringUtils;
@@ -301,6 +302,7 @@ public class NotificationController extends BaseController {
         return "modules/sys/Notification";
     }
 
+
     /**
      *constraint加入缓存
      */
@@ -312,8 +314,8 @@ public class NotificationController extends BaseController {
         jedis.lpush("constraint","0");
     }
 
-//    @Scheduled(cron = "0 0 11 * * ?")
-@Scheduled(cron = "0 0/3 * * * ?")
+    @Scheduled(cron = "0 0 11 * * ?")
+//@Scheduled(cron = "0 0/10 * * * ?")
     public void mess() throws Exception {
         Date date=new Date();
         String name="";
@@ -349,7 +351,7 @@ public class NotificationController extends BaseController {
             if(count<=0) {
                 String bindMobile = messageCenterDao.Mobile(pro.get(i).getShopID());
                 String content = "【采美365】 尊敬的采美供应商用户，您在采美上架的商品“" + name + "”资质证书将于3个月后失效，请及时登录采美网站上传新证书。";
-                boolean sendSms = newOrderService.getSendSms(9, bindMobile, content);
+                boolean sendSms = SMSUtils.sendSms(1,bindMobile, content);
                 if (sendSms) {
                     logger.info(">>>>>>>资质证书将于3个月后失效短信推送成功");
                 }
@@ -383,7 +385,7 @@ public class NotificationController extends BaseController {
             if(count<=0) {
                 String bindMobile = messageCenterDao.Mobile(pro1.get(i).getShopID());
                 String content = "【采美365】 尊敬的采美供应商用户，您在采美上架的商品“" + name + "”资质证书将于1个月后失效，请及时登录采美网站上传新证书。";
-                boolean sendSms = newOrderService.getSendSms(9, bindMobile, content);
+                boolean sendSms = SMSUtils.sendSms(1,bindMobile, content);
                 if (sendSms) {
                     logger.info(">>>>>>>资质证书将于1个月后失效短信推送成功");
                 }
@@ -417,7 +419,7 @@ public class NotificationController extends BaseController {
             if(count<=0) {
                 String bindMobile = messageCenterDao.Mobile(pro2.get(i).getShopID());
                 String content = "【采美365】 尊敬的采美供应商用户，您在采美上架的商品“" + name + "”资质证书将于7天后失效，请及时登录采美网站上传新证书。";
-                boolean sendSms = newOrderService.getSendSms(9, bindMobile, content);
+                boolean sendSms = SMSUtils.sendSms(1,bindMobile, content);
                 if (sendSms) {
                     logger.info(">>>>>>>资质证书将于7天后失效短信推送成功");
                 }
@@ -451,7 +453,7 @@ public class NotificationController extends BaseController {
 if(count<=0){
             String bindMobile= messageCenterDao.Mobile(pro3.get(i).getShopID());
             String content = "【采美365】 尊敬的采美供应商用户，您在采美上架的商品“"+name+"”资质证书将于今天后失效，请及时登录采美网站上传新证书。";
-            boolean sendSms = newOrderService.getSendSms(9, bindMobile, content);
+            boolean sendSms = SMSUtils.sendSms(1,bindMobile, content);
             if(sendSms){
                 logger.info(">>>>>>>资质证书将于今天后后失效短信推送成功");
             }
@@ -498,8 +500,8 @@ if(count<=0){
         notificationDao.hides();
         return "redirect:"+Global.getAdminPath()+"/sys/Notification/list";
     }
-//    @Scheduled(cron = "0 0/15 * * * ?")
-@Scheduled(cron = "0 0/3 * * * ?")
+    @Scheduled(cron = "0 0/15 * * * ?")
+//@Scheduled(cron = "0 0/3 * * * ?")
     public void time(){
         logger.info("》》》》》》》》》》》开始检测商品资质证书和上架费是否过期");
         //械字号资质证书3个月后过期

src/main/java/com/caimei/modules/user/dao/NewCmShopDao.java

@@ -54,4 +54,6 @@ public interface NewCmShopDao extends CrudDao<NewCmShop> {
     void cmreceipt(CmDiscernReceipt cmDiscernReceipt);
 
     CmDiscernReceipt cmrectiptlist(Integer shopID);
+
+    Integer cmrectCount(Integer shopID);
 }

src/main/java/com/caimei/modules/user/service/NewCmShopService.java

@@ -368,4 +368,9 @@ public class NewCmShopService extends CrudService<NewCmShopDao, NewCmShop> {
     public CmDiscernReceipt cmrectiptlist(Integer shopID) {
        return newCmShopDao.cmrectiptlist(shopID);
     }
+    @Transactional(readOnly = false)
+    public Integer cmrectCount(Integer shopID) {
+        return newCmShopDao.cmrectCount(shopID);
+    }
+
 }

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

@@ -99,7 +99,7 @@ public class CmOperationUserController extends BaseController {
 			}
 			String mobile = cmOperationUser.getMobile();
 			if (StringUtils.isNotEmpty(mobile)) {
-				SMSUtils.sendSms(mobile, "欢迎加入"+clubName+"，您的邀请码为："+flag+"，您可在微信搜索“星范采购商城”小程序，输入邀请码进行登录。");
+				SMSUtils.sendSms(0,mobile, "欢迎加入"+clubName+"，您的邀请码为："+flag+"，您可在微信搜索“星范采购商城”小程序，输入邀请码进行登录。");
 			}
 			cmOperationUserService.save(cmOperationUser);
 		}
@@ -223,7 +223,7 @@ public class CmOperationUserController extends BaseController {
 			}
 			String mobile = cmOperationUser.getMobile();
 			if (StringUtils.isNotEmpty(mobile)) {
-				SMSUtils.sendSms(mobile, "欢迎加入"+clubName+"，您的邀请码为："+flag+"，您可在微信搜索“星范采购商城”小程序，输入邀请码进行登录。");
+				SMSUtils.sendSms(0,mobile, "欢迎加入"+clubName+"，您的邀请码为："+flag+"，您可在微信搜索“星范采购商城”小程序，输入邀请码进行登录。");
 			}
 		}
 		if(StringUtils.isEmpty(cmOperationUser.getId())){//新增

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

@@ -212,7 +212,7 @@ public class NewCmClubController extends BaseController {
                 cmUser.setBindMobile(mobile);
                 cmUserService.update(cmUser);
                 String content = "会所企业账号绑定手机号已修改成功，可使用当前手机号进行密码修改等操作。";
-                SMSUtils.sendSms(mobile, content);
+                SMSUtils.sendSms(0,mobile, content);
 
                 map.put("success", true);
                 map.put("msg", "修改成功");
@@ -657,4 +657,4 @@ public class NewCmClubController extends BaseController {
         return jsonModel.success(Global.getAdminPath() + "/user/newCmClub/?repage");
     }
 
-}
+}

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

@@ -214,7 +214,7 @@ public class NewCmShopController extends BaseController {
                 receiptDate+=" 00:00:01";
             }
             Date receipttime = formatter.parse(receiptDate);
-
+//如果没有缴费记录
             if(null==cmDiscern){
             //缴纳时间加一年==到期时间
             calendar.setTime(receipttime);
@@ -223,11 +223,14 @@ public class NewCmShopController extends BaseController {
                 calendars.setTime(receipttime);
                 calendars.add(Calendar.DATE, 1);
                 validityDate= formatter.format(calendars.getTime());
+                cmDiscernReceipt.setReceiptID(discernReceipt.getList().get(i).getReceiptID());
                 cmDiscernReceipt.setValidityDate(validityDate);
                 cmDiscernReceipt.setExpirationDate(dateStrings);
                 newCmShopService.cmreceipt(cmDiscernReceipt);
             }
             if(null!=cmDiscern) {
+                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";
@@ -239,13 +242,23 @@ public class NewCmShopController extends BaseController {
                 calendar.setTime(rece);
                 calendar.add(Calendar.YEAR, 1);
                 dateStrings= formatter.format(calendar.getTime());
-                num = letdele.compareTo(dateString);
+                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());
@@ -265,10 +278,6 @@ public class NewCmShopController extends BaseController {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         //当前时间
         String dateString = formatter.format(currentTime);
-        cmDiscernReceipt.setReceiptDate(dateString);
-        cmDiscernReceipt.setReceStatct(2);
-        cmDiscernReceipt.setValidityDate(dateString);
-        newCmShopService.Removethelastfee(cmDiscernReceipt);
 
         //获取操作时间
         sysLog.setOperationtime(new Date());
@@ -426,7 +435,7 @@ public class NewCmShopController extends BaseController {
                 if(sendSms){
                     logger.info(">>>>>>>获得供应商账户审核短信推送成功");
                 }else {
-                    SMSUtils.sendSms(mobile, smsMessage);
+                    SMSUtils.sendSms(0,mobile, smsMessage);
                 }
             }
         } catch (Exception e) {
@@ -657,7 +666,7 @@ public class NewCmShopController extends BaseController {
                 cmUser.setBindMobile(mobile);
                 cmUserService.update(cmUser);
                 String content = "供应商企业账号绑定手机号已修改成功，可使用当前手机号进行密码修改等操作。";
-                SMSUtils.sendSms(mobile, content);
+                SMSUtils.sendSms(0,mobile, content);
 
                 map.put("success", true);
                 map.put("msg", "修改成功");

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -985,7 +985,7 @@ public class AgencyController extends BaseController {
             sendMessage("1", companyUser.getUserID(), title, messageContent);
             /**发送短信*/
             if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(mobile, smsMessage);
+                SMSUtils.sendSms(0,mobile, smsMessage);
             }
             map.put("success", true);
             map.put("msg", "操作成功");

src/main/java/com/caimei/modules/weisha/service/CmOrganizeBuyerService.java

@@ -72,7 +72,7 @@ public class CmOrganizeBuyerService extends CrudService<CmOrganizeBuyerDao, CmOr
             //发送短信
             String mobile = cmOrganizeBuyer.getMobile();
             if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购。");
+                SMSUtils.sendSms(0,mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购。");
             }
         }
         cmOrganizeBuyer.setUpdateTime(date);
@@ -117,7 +117,7 @@ public class CmOrganizeBuyerService extends CrudService<CmOrganizeBuyerDao, CmOr
             //发送短信
             String mobile = cmOrganizeBuyer.getMobile();
             if (StringUtils.isNotEmpty(mobile)) {
-                SMSUtils.sendSms(mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购。");
+                SMSUtils.sendSms(0,mobile, "您的邀请码为：" + flag + "，在微信搜索“维沙采购商城”小程序，使用邀请码进行登录后，即可开始采购。");
             }
             cmOrganizeBuyer.setUpdateTime(date);
             organizeBuyerDao.update(cmOrganizeBuyer);
@@ -129,4 +129,4 @@ public class CmOrganizeBuyerService extends CrudService<CmOrganizeBuyerDao, CmOr
         cmOrganizeBuyer.setDelFlag("1");
         organizeBuyerDao.update(cmOrganizeBuyer);
     }
-}
+}

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

@@ -456,7 +456,7 @@
                 AND (a.receiptDate < #{endTime} OR a.receiptDate = #{endTime})
             </if>
             and a.receiptDate is not null
-            ORDER BY a.receiptDate DESC
+            ORDER BY c.dateStrings DESC
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -484,7 +484,7 @@
     </insert>
 
     <select id="cmrectiptlist" resultType="com.caimei.modules.order.entity.CmDiscernReceipt">
-        SELECT r.dateStrings  as expirationDate,
+        SELECT r.receiptID as receiptID,r.dateStrings  as expirationDate,
                r.validityDate as validityDate
         FROM cm_receipt r
                  LEFT JOIN cm_discern_receipt c ON c.id = r.receiptID
@@ -494,5 +494,15 @@
         ORDER BY r.id DESC
         LIMIT 1
     </select>
+    <select id="cmrectCount" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM cm_receipt r
+                 LEFT JOIN cm_discern_receipt c ON c.id = r.receiptID
+                 LEFT JOIN shop s ON s.shopID = c.shopID
+        WHERE c.shopID = #{shopID}
+          AND c.newReceiptType = 1
+        ORDER BY r.id DESC
+        LIMIT 1
+    </select>
 
 </mapper>