he2802 1 سال پیش
والد
کامیت
1858f829a3

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderHandleQueryBo.java

@@ -90,4 +90,6 @@ public class OrderHandleQueryBo extends BaseEntity {
 	/** 经办手机号 */
 	@ApiModelProperty("经办手机号")
 	private String telphone;
+	@ApiModelProperty("录单订单编号")
+	private String inputOrderSn;
 }

+ 11 - 13
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderHandleServiceImpl.java

@@ -195,21 +195,19 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
             Long secLong = 0L;
             Long studyLong = 0L;
 
-            if (vo.getPayStatus() == 1) {
-                SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
-                subjectStudyRecordQueryBo.setGoodsId(vo.getGoodsId());
-                subjectStudyRecordQueryBo.setUserId(vo.getUserId());
-                subjectStudyRecordQueryBo.setGradeId(vo.getGradeId());
-                subjectStudyRecordQueryBo.setOrderGoodsId(vo.getOrderGoodsId());
-                List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
-                for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
-                    secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
-                    studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
+            SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
+            subjectStudyRecordQueryBo.setGoodsId(vo.getGoodsId());
+            subjectStudyRecordQueryBo.setUserId(vo.getUserId());
+            subjectStudyRecordQueryBo.setGradeId(vo.getGradeId());
+            subjectStudyRecordQueryBo.setOrderGoodsId(vo.getOrderGoodsId());
+            List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
+            for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
+                secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
+                studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
 
-                }
-                vo.setSecAllNum(secLong);
-                vo.setStuAllNum(studyLong);
             }
+            vo.setSecAllNum(secLong);
+            vo.setStuAllNum(studyLong);
             //退款
             OrderGoodsRefund refund = iOrderGoodsRefundService
                     .getOne(new LambdaQueryWrapper<OrderGoodsRefund>()