submit

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

@@ -4131,40 +4131,40 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     public Long checkFinishRequiredCourse(ClassGradeUserQueryBo bo) {
         //查询旧系统是否有学习
         String businessName = iGoodsService.getGoodsBusinessName(bo.getGoodsId());
-//        if (businessName.contains("继续教育二级建造师") || businessName.contains("继续教育二级造价师")){
-//            OrderGoods orderGoods = baseMapper.getOrderGoods(bo.getUserId(),bo.getGoodsId());
-//            if (ObjectUtils.isNotNull(orderGoods)){
-//                ClassGradeUser classGradeUser = getOne(new LambdaQueryWrapper<ClassGradeUser>()
-//                        .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
-//                        .eq(ClassGradeUser::getUserId, bo.getUserId())
-//                        .eq(ClassGradeUser::getStatus, 1)
-//                        .last("limit 1"));
-//                if (ObjectUtils.isNotNull(classGradeUser) && ObjectUtils.isNotNull(classGradeUser.getPeriodWaitTime())){
-//                    //重修
-//                    return 0L;
-//                }
-//            }
-//            User user = iUserService.getById(bo.getUserId());
-//            Integer type = "继续教育二级建造师".equals(businessName)?1:2;
-//            String param = String.format("idnum=%s&type=%s",EncryptHandler.decrypt(user.getIdCard()),type);
-//            String respone = "";
-//            try {
-//                respone = HttpUtils.sendGet(OLD_STUDY_CHECK, param);
-//                JSONObject jsonObject1 = JSONObject.parseObject(respone);
-//                UserStudyTimeVo timeVo = JSONArray.parseObject(jsonObject1.get("data").toString(), UserStudyTimeVo.class);
-//                if (ObjectUtils.isNotNull(timeVo) && ObjectUtils.isNotNull(timeVo.getStudyStartTime()) && timeVo.getStudyFlag()){
-//                    //旧系统正在学习中
-//                    throw new CustomException("请把旧云学堂课程学习完成，再学习另一个课程");
-//                }
-//            } catch (Exception e) {
-//                throw new CustomException(e.getMessage());
-//            }
-//            List<Long> goodsIds = baseMapper.getFinishRequiredCourse(bo);
-//            if(Validator.isNotEmpty(goodsIds)&&goodsIds.size()>0){
-//                Goods goods = iGoodsService.getById(goodsIds.get(0));
-//                throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
-//            }
-//        }
+        if (businessName.contains("继续教育二级建造师") || businessName.contains("继续教育二级造价师")){
+            OrderGoods orderGoods = baseMapper.getOrderGoods(bo.getUserId(),bo.getGoodsId());
+            if (ObjectUtils.isNotNull(orderGoods)){
+                ClassGradeUser classGradeUser = getOne(new LambdaQueryWrapper<ClassGradeUser>()
+                        .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
+                        .eq(ClassGradeUser::getUserId, bo.getUserId())
+                        .eq(ClassGradeUser::getStatus, 1)
+                        .last("limit 1"));
+                if (ObjectUtils.isNotNull(classGradeUser) && ObjectUtils.isNotNull(classGradeUser.getPeriodWaitTime())){
+                    //重修
+                    return 0L;
+                }
+            }
+            User user = iUserService.getById(bo.getUserId());
+            Integer type = "继续教育二级建造师".equals(businessName)?1:2;
+            String param = String.format("idnum=%s&type=%s",EncryptHandler.decrypt(user.getIdCard()),type);
+            String respone = "";
+            try {
+                respone = HttpUtils.sendGet(OLD_STUDY_CHECK, param);
+                JSONObject jsonObject1 = JSONObject.parseObject(respone);
+                UserStudyTimeVo timeVo = JSONArray.parseObject(jsonObject1.get("data").toString(), UserStudyTimeVo.class);
+                if (ObjectUtils.isNotNull(timeVo) && ObjectUtils.isNotNull(timeVo.getStudyStartTime()) && timeVo.getStudyFlag()){
+                    //旧系统正在学习中
+                    throw new CustomException("请把旧云学堂课程学习完成，再学习另一个课程");
+                }
+            } catch (Exception e) {
+                throw new CustomException(e.getMessage());
+            }
+            List<Long> goodsIds = baseMapper.getFinishRequiredCourse(bo);
+            if(Validator.isNotEmpty(goodsIds)&&goodsIds.size()>0){
+                Goods goods = iGoodsService.getById(goodsIds.get(0));
+                throw new CustomException("请按顺序学习，把【"+goods.getGoodsName()+"】学习完成，再学习另一个课程");
+            }
+        }
         return 0L;
     }
 

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

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.constant.Constants;
@@ -2098,16 +2099,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (Validator.isEmpty(userVo.getGzhOpenId())) {
                 throw new CustomException("请先授权绑定公众号信息");
             }
-            log.error("公众号opendID："+userVo.getGzhOpenId());
-            payResult = iWxPayService.paymentGzh(pay_no, userVo.getGzhOpenId(), body, payPrice, bo.getUrl());
-            try {
+            if (tenantId.equals("480813706424615769")){
                 ObjectMapper mapper = new ObjectMapper();
-                String prettyJson = mapper.writerWithDefaultPrettyPrinter()
-                        .writeValueAsString(payResult);
-                log.error("payResul微信返回结果："+prettyJson);
-            }catch (Exception e){
-                e.printStackTrace();
+                try {
+                    log.error("前端参数："+ mapper.writeValueAsString(bo));
+                } catch (JsonProcessingException e) {
+                    e.printStackTrace();
+                }
             }
+            payResult = iWxPayService.paymentGzh(pay_no, userVo.getGzhOpenId(), body, payPrice, bo.getUrl());
         }else {
             instTimeSettleOrder(add,DateUtils.getNowTime());
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -376,7 +376,7 @@ public class WxPayServiceImpl implements IWxPayService {
             String TenantId = ServletUtils.getRequest().getHeader("TenantId");
             data.put("attach", TenantId);
             resp = wxpay.unifiedOrder(data);
-            log.error("h5支付:"+JSON.toJSONString(resp));
+//            log.error("h5支付:"+JSON.toJSONString(resp));
             Map<String, String> result = new HashMap<>();
             //         result.put("provider","wxpay");
             result.put("appId", gzhAppid);