fix 增加工单截图;退款关闭对应工单;查看双重验证码次数

netflix-dao/src/main/java/com/cyksj/model/entity/WorkOrder.java

@@ -26,6 +26,8 @@ public class WorkOrder extends BaseEntity{
 
 	private Long goodsId;
 
+	private String imgs;
+
 	private Long skuId;
 
 	private Status status;

netflix-dao/src/main/java/com/cyksj/model/views/UserWorkOrderView.java

@@ -28,6 +28,9 @@ public class UserWorkOrderView {
 	@DbField("wo.account")
 	private String account;
 
+	@DbField("wo.imgs")
+	private String imgs;
+
 	@DbField("g.title")
 	private String title;
 

netflix-dao/src/main/java/com/cyksj/model/views/WorkOrderView.java

@@ -56,6 +56,9 @@ public class WorkOrderView {
 	@DbField("wo.goods_id")
 	private Long goodsId;
 
+	@DbField("wo.imgs")
+	private String imgs;
+
 	@DbIgnore
 	private String title;
 

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -267,6 +267,13 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         //修改订单状态
         orderDon.setStatus(OrderDon.Status.refund);
         orderDonMapper.updateById(orderDon);
+        //提交过工单的订单
+        //将用户异常订单关闭
+        workOrderMapper.update(null, Wrappers.lambdaUpdate(WorkOrder.class)
+                .set(WorkOrder::getStatus, WorkOrder.Status.close)
+                .eq(WorkOrder::getStatus, WorkOrder.Status.waiting)
+                .eq(WorkOrder::getUserId, orderDon.getUserId())
+                .eq(WorkOrder::getRelationId, orderDon.getRelationId()));
     }
 
     public String wxRefund(OrderRefundReq refundReq, OrderDon orderDon) throws Exception {
@@ -407,6 +414,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             //将用户异常订单关闭
             workOrderMapper.update(null, Wrappers.lambdaUpdate(WorkOrder.class)
                     .set(WorkOrder::getStatus, WorkOrder.Status.close)
+                    .eq(WorkOrder::getStatus, WorkOrder.Status.waiting)
                     .eq(WorkOrder::getUserId, userId)
                     .eq(WorkOrder::getRelationId, relationId));
         }

netflix-service/src/main/java/com/cyksj/service/user/impl/WorkOrderFrontServiceImpl.java

@@ -72,6 +72,9 @@ public class WorkOrderFrontServiceImpl implements WorkOrderFrontService {
 		if (StrUtil.isNotBlank(content) && content.length() > 200) {
 			throw BusinessRuntimeException.getInstance("问题描述最多输入200字数以内");
 		}
+		if (StrUtil.isNotBlank(imgs) && imgs.length() > 2000) {
+			throw BusinessRuntimeException.getInstance("图片过多");
+		}
 		List<Long> userIds = userService.getRelationUserIdList(userId, user);
 		GroupRelationDetailView detailView = beanSearcher.searchFirst(GroupRelationDetailView.class, MapUtils.builder()
 				.field(GroupRelationDetailView::getUserId, userIds).op(Operator.InList)

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -222,8 +222,8 @@ public class GroupRelationController {
                 .between(DoubleVerifyClickRecord::getCreatedTime, DateUtil.beginOfMonth(now), DateUtil.endOfMonth(now)));
         UserFuncProperty userFuncProperty = userFuncPropertyMapper.selectOne(Wrappers.lambdaQuery(UserFuncProperty.class)
                 .eq(UserFuncProperty::getUserId, userId).last("limit 1"));
-        //默认3次
-        int num = 3;
+        //默认1次
+        int num = 1;
         if (userFuncProperty != null) num = userFuncProperty.getVerifyCheckNum();
         if (count >= num) throw BusinessRuntimeException.getInstance("获取双重验证码次数上限");
         int second = now.second();