submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -633,7 +633,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     public String pushOfficialInfo(ClassGradeUserQueryBo bo) {
         OFFICIALPUSH_INFOACCOUNT = null;
         OFFICIALPUSH_TOKEN = null;
-        log.info("报名信息推送" + JSON.toJSONString(bo));
         //暂时先关闭信息推送入口
 //        if (true){
 //            return "";
@@ -708,7 +707,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         params.put("dh", userVo.getTelPhone());
         params.put("bmrq", DateUtils.timestampToDate(bmrq));
         String dataTxt = params.get("zh") + params.get("bh") + params.get("xm") + params.get("sfz") + params.get("dh") + params.get("bmrq");
-        log.info("报名信息推送参数"+ dataTxt);
         try {
             String encrypted = dataSign(dataTxt, OFFICIALPUSH_TOKEN);
             params.put("SignMsg", encrypted);
@@ -770,7 +768,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     public String pushSevenOfficialInfo(ClassGradeUserQueryBo bo,ClassGradeUserVo userVo,OrderGoodsVo orderGoods,Goods goods) {
         String SEVEN_OFFICIALPUSH_INFOACCOUNT=null;
         String SEVEN_OFFICIALPUSH_TOKEN=null;
-        log.info("报名信息推送" + JSON.toJSONString(bo));
         //暂时先关闭信息推送入口
 //        if (true){
 //            return "";
@@ -934,7 +931,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         params.put("xl", userVo.getEduLevel());
         params.put("xb", getUserSex(userVo.getIdCard()));
         String dataTxt = params.get("zh") + params.get("bh") + params.get("year") + params.get("xm") + params.get("sfz") + params.get("dh") + params.get("dw") + params.get("xl") + params.get("xb") + params.get("bmrq");
-        log.info("报名信息推送参数"+ dataTxt);
         try {
             String encrypted = dataSign(dataTxt, SEVEN_OFFICIALPUSH_TOKEN);
             params.put("SignMsg", encrypted);

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -240,6 +240,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             userStudyRecordQueryBo.setGoodsId(goods.getGoodsId());
             userStudyRecordQueryBo.setUserId(order.getUserId());
             userStudyRecordQueryBo.setGradeId(orderGoods.getGradeId());
+            userStudyRecordQueryBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
             Long userSeeTime = iUserStudyRecordService.getUserSeeTime(userStudyRecordQueryBo);
             if(userSeeTime.longValue()>=(30*60)){ //超30分钟不满足退款
                 throw new CustomException("不满足退款");