add 乐器置换回调加详情

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -100,6 +100,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         if (replacementInstrumentCooperation != null && replacementInstrumentCooperation.getOpenPay().equals(YesOrNoEnum.YES)) {
             replacementInstrumentActivity.setOpenFlag(1);
         }
+        Boolean sendPush = false;
         if (activity != null) {
             if (!activity.getPayStatus().equals(0)) {
                 throw new BizException("您已参与调查，谢谢参与！");
@@ -107,11 +108,15 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             //覆盖之前的数据
             replacementInstrumentActivity.setId(activity.getId());
             replacementInstrumentActivityDao.update(replacementInstrumentActivity);
+            if (replacementInstrumentActivity.getInstrumentsId() != null && !replacementInstrumentActivity.getInstrumentsId().equals(activity.getInstrumentsId())) {
+                sendPush = true;
+            }
         } else {
             replacementInstrumentActivityDao.insert(replacementInstrumentActivity);
+            sendPush = true;
         }
         //已开启缴费推送购买链接
-        if (replacementInstrumentActivity.getOpenFlag().equals(1) && replacementInstrumentActivity.getInstrumentsId() != null) {
+        if (sendPush && replacementInstrumentActivity.getOpenFlag().equals(1) && replacementInstrumentActivity.getInstrumentsId() != null) {
             ReplacementInstrument replacementInstrument = replacementInstrumentDao.get(replacementInstrumentActivity.getInstrumentsId());
             Map<Integer, String> userMap = new HashMap<>();
             Map<Integer, String> userPhoneMap = new HashMap<>();

mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

@@ -221,7 +221,7 @@
     </select>
 
     <select id="getPushUsers" resultMap="ReplacementInstrumentActivityStatDto">
-        SELECT ria.*, su.phone_ mobile_no_, ri.brand_
+        SELECT ria.id_,ria.user_id_, su.phone_ mobile_no_, ri.brand_
         FROM replacement_instrument_activity ria
                  LEFT JOIN sys_user su ON su.id_ = ria.user_id_
                  LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -87,6 +87,8 @@ public class StudentOrderController extends BaseController {
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
     @Autowired
     private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
+    @Autowired
+    private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
 
 
     @Value("${spring.profiles.active:dev}")
@@ -178,6 +180,8 @@ public class StudentOrderController extends BaseController {
             }
         } else if (orderByOrderNo.getGroupType().equals(GroupType.GOODS_SELL)) {
             orderDetail.put("detail", studentGoodsSellDao.getStudentGoodsSellDto(orderNo));
+        } else if (orderByOrderNo.getGroupType().equals(GroupType.REPLACEMENT)) {
+            orderDetail.put("detail", replacementInstrumentActivityDao.getInfo(Integer.parseInt(orderByOrderNo.getMusicGroupId())));
         }
         return succeed(orderDetail);
     }
@@ -339,7 +343,7 @@ public class StudentOrderController extends BaseController {
     //    @Scheduled(cron = "0/30 * * * * ?")
     @GetMapping("/setSuccessStatus")
     public HttpResponseResult setSuccessStatus(String orderNo) throws Exception {
-        if (!profiles.equals("dev")&&!profiles.equals("test")) {
+        if (!profiles.equals("dev") && !profiles.equals("test")) {
             return failed("非法操作");
         }
         List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.ING, "ADAPAY");
@@ -788,7 +792,7 @@ public class StudentOrderController extends BaseController {
     }
 
     @GetMapping("/getMusicGroupApplyCalender")
-    public HttpResponseResult<MusicGroupPaymentCalender> getMusicGroupApplyCalender(String musicGroupId){
+    public HttpResponseResult<MusicGroupPaymentCalender> getMusicGroupApplyCalender(String musicGroupId) {
         MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(musicGroupId);
         if (musicGroupRegCalender != null) {
             MusicGroup musicGroup = musicGroupService.get(musicGroupId);

mec-web/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentActivityController.java

@@ -82,6 +82,9 @@ public class ReplacementInstrumentActivityController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('replacementInstrumentActivity/update')")
     public HttpResponseResult<ReplacementInstrumentActivity> update(ReplacementInstrumentActivity replacementInstrumentActivity) {
         ReplacementInstrumentActivity oldReplacementInstrumentActivity = replacementInstrumentActivityDao.getLock(replacementInstrumentActivity.getId());
+        if (!oldReplacementInstrumentActivity.getPayStatus().equals(0)) {
+            return failed("支付中、已支付的乐器置换，不能修改");
+        }
         if (oldReplacementInstrumentActivity.getInstrumentsId().equals(replacementInstrumentActivity.getInstrumentsId())) {
             return succeed();
         }
@@ -115,7 +118,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
         queryInfo.setRows(99999);
         PageInfo<ReplacementInstrumentActivityStatDto> pageList = replacementInstrumentActivityService.getPageList(queryInfo);
 
-        if (pageList.getTotal() <=0) {
+        if (pageList.getTotal() <= 0) {
             throw new BizException("没有可导出的记录");
         }
 
@@ -123,7 +126,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
         HSSFWorkbook workbook = null;
         try {
             String[] header = {"合作单位编号", "合作单位", "学员编号", "学员姓名", "联系电话", "声部", "品牌", "型号"};
-            String[] body = {"cooperationOrganId", "cooperationOrganName","userId", "userName", "mobileNo", "subjectName", "brand", "specification"};
+            String[] body = {"cooperationOrganId", "cooperationOrganName", "userId", "userName", "mobileNo", "subjectName", "brand", "specification"};
             workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=replacement-" + DateUtil.getDate(new Date()) + ".xls");