后台审核申请单列表

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysOpenShopApplyOrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.wwdz.ch.admin.impl;
 
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.admin.service.SysOpenShopApplyOrderService;
+import com.wwdz.ch.core.consts.CommonEnum;
 import com.wwdz.ch.core.consts.OpenShopApplyOrderEnum;
 import com.wwdz.ch.core.entity.openShop.OpenShopApplyOrderVo;
 import com.wwdz.ch.core.type.PageSearchResult;
@@ -132,7 +133,11 @@ public class SysOpenShopApplyOrderServiceImpl implements SysOpenShopApplyOrderSe
     public Result auditApplyOrder(OpenShopApplyOrderRequestDto dto) {
         try {
             OpenShopApplyOrder openShopApplyOrder = openShopApplyOrderDao.findByOrderId(dto.getOpenShopApplyOrderId());
-            openShopApplyOrderDao.updateState(dto.getOpenShopApplyOrderId(), dto.getState());
+            OpenShopApplyOrder updateApplyOrderDto = new OpenShopApplyOrder();
+            updateApplyOrderDto.setOpenShopApplyOrderId(dto.getOpenShopApplyOrderId());
+            updateApplyOrderDto.setRemark(dto.getRemark());
+            updateApplyOrderDto.setState(dto.getState());
+            openShopApplyOrderDao.update(updateApplyOrderDto);
             if (OpenShopApplyOrderEnum.StateEnum.PASSED.getCode() == dto.getState()) {
                 LocalDateTime now = LocalDateTime.now();
                 LocalDateTime endValidTime = now.plusYears(1);
@@ -140,6 +145,9 @@ public class SysOpenShopApplyOrderServiceImpl implements SysOpenShopApplyOrderSe
                 CollectorWhiteList collectorWhiteList = new CollectorWhiteList();
                 collectorWhiteList.setCollectorId(openShopApplyOrder.getUserId());
                 collectorWhiteList.setEndValidTime(DateUtils.fromLocalDateTime(endValidTime));
+                collectorWhiteList.setDeliveryAuth(CommonEnum.StateEnum.VALID.getCode());
+                collectorWhiteList.setIsShow(true);
+                collectorWhiteList.setIsUploadLimit(false);
                 collectorWhiteList.setIsValid(true);
                 collectorWhiteListDao.upsert(collectorWhiteList);
                 //查询开店费缴纳订单,用于未支付订单

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/openShop/OpenShopApplyOrderRequestDto.java

@@ -53,4 +53,6 @@ public class OpenShopApplyOrderRequestDto extends BaseRequestDto {
      * 1开店费，2质保金
      */
     private Integer costType;
+
+    private String remark;
 }