bugfix

src/main/java/com/caimei/modules/bulkpurchase/dao/CmClubDao.java

@@ -3,6 +3,8 @@ package com.caimei.modules.bulkpurchase.dao;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.caimei.modules.bulkpurchase.entity.CmClub;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -14,4 +16,6 @@ import java.util.List;
 public interface CmClubDao extends CrudDao<CmClub> {
 
    List<CmClub> findClubById(Long clubId);
-}
+
+   void updateServiceProvider(@Param("clubId")Integer clubId,@Param("oldSpId")Integer oldSpId,@Param("newSpId")Integer newSpId);
+}

src/main/java/com/caimei/modules/bulkpurchase/service/CmClubService.java

@@ -25,20 +25,22 @@ public class CmClubService extends CrudService<CmClubDao, CmClub> {
 	public CmClub get(String id) {
 		return super.get(id);
 	}
-	
+
 	public List<CmClub> findList(CmClub cmClub) {
 		return super.findList(cmClub);
 	}
-	
+
 	public Page<CmClub> findPage(Page<CmClub> page, CmClub cmClub) {
 		return super.findPage(page, cmClub);
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void save(CmClub cmClub) {
 		super.save(cmClub);
 	}
-	
+
+
+
 	@Transactional(readOnly = false)
 	public void delete(CmClub cmClub) {
 		super.delete(cmClub);
@@ -48,4 +50,4 @@ public class CmClubService extends CrudService<CmClubDao, CmClub> {
 		List<CmClub> cmClub=cmClubDao.findClubById(clubId);
 		return cmClub.get(0);
     }
-}
+}

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

@@ -358,7 +358,10 @@ public class CmCouponController extends BaseController {
         List<Integer> clubIds = messageCenterDao.ClubIds();
 
 //        new Thread(() -> consumer(cmCoupon, clubIds)).start();
-        consumer(cmCoupon, clubIds);
+      if("".equals(cmCoupon.getId())){
+            consumer(cmCoupon, clubIds);
+
+
 
         RedisLearn.producer(clubIds);
         MessageCenter messageCenter = new MessageCenter();
@@ -387,7 +390,7 @@ public class CmCouponController extends BaseController {
                 logger.info(">>>>>>>发送成功");
             }
         }
-
+      }
         cmCouponService.save(cmCoupon);
         addMessage(redirectAttributes, "保存优惠券成功");
         return "redirect:" + Global.getAdminPath() + "/coupon/cmCoupon/list?couponType=" + cmCoupon.getCouponType();

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

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import com.caimei.modules.bulkpurchase.dao.CmClubDao;
 import com.caimei.modules.consult.entity.type.CmConsulttype;
 import com.caimei.modules.oss.service.CmOssArchiveService;
 import com.caimei.modules.oss.utils.OSSUtils;
@@ -36,6 +37,8 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
 
     @Autowired
     private NewCmClubDao newCmClubDao;
+    @Autowired
+    private CmClubDao cmClubDao;
 
     @Autowired
     private CmOssArchiveService cmOssArchiveService;
@@ -196,6 +199,13 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         newCmClubDao.oldnames(clubID,oldSpID,newSpID);
     }
 
+    @Transactional(readOnly = false)
+    public void updateServiceProvider(Integer clubId , Integer oldSpID,Integer newSpID){
+
+        cmClubDao.updateServiceProvider(clubId,oldSpID,newSpID);
+    }
+
+
     public Page<CmReport> ReportList(Page<CmReport> cmReports ,CmReport cmReport){
        cmReport.setPage(cmReports);
        List<CmReport>list= newCmClubDao.ReportList(cmReport);

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

@@ -133,11 +133,15 @@ public class SpController extends BaseController {
                         newCmClubService.oldname(oldserviceProviderId,clubId,oldSpID,newspId);
                      }else {
                         newCmClubService.oldnames(clubId,oldSpID,newspId);
+                        newCmClubService.updateServiceProvider(clubId,oldSpID,newspId);
                     }
                     }
                     System.out.println("旧ID>>>>>>>>" + cssp.getOldSpID());
                     System.out.println("ID>>>>>>>>" + cssp.getNewSpID());
                     System.out.println("ID>>>>>>>>" + cssp.getClubID());
+
+
+
                     // 查询serviceprovider协销表
                     List<ServiceProviderModel> serviceprovider = serviceProviderDao.getServiceproviderById(cssp.getNewSpID());
                     // 查询cm_bind表

src/main/resources/mappings/modules/bulkpurchase/CmClubMapper.xml

@@ -221,4 +221,12 @@
 		ON b.cityID=c.cityID JOIN province d ON c.`provinceID` =d.`provinceID`
 		JOIN club a ON a.townID =b.townID WHERE  a.clubID=#{clubId}
 	</select>
+
+	<update id="updateServiceProvider">
+		UPDATE `cm_club_report`
+		SET serviceProviderId=#{newSpId}
+		WHERE clubId = #{clubId}
+		  AND serviceProviderId = #{oldSpId}
+	</update>
+
 </mapper>