查询开店申请单

ch-wx-api/src/main/java/com/wwdz/ch/wx/api/WxPayCallbackController.java

@@ -9,6 +9,7 @@ import com.wwdz.ch.core.api.OfficialAccountApi;
 import com.wwdz.ch.core.api.WxAppletApi;
 import com.wwdz.ch.core.api.wxpay.WxPayServiceApi;
 import com.wwdz.ch.core.consts.*;
+import com.wwdz.ch.core.entity.openShop.OpenShopApplyOrderVo;
 import com.wwdz.ch.core.notify.AliSmsSender;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.IdUtils;
@@ -17,9 +18,11 @@ import com.wwdz.ch.core.util.RedisUtils;
 import com.wwdz.ch.core.util.TimeUtil;
 import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.dao.openShop.GuaranteeMoneyRecordDao;
+import com.wwdz.ch.db.dao.openShop.OpenShopApplyOrderDao;
 import com.wwdz.ch.db.dao.openShop.OpenShopCostRecordDao;
 import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.domain.openShop.GuaranteeMoneyRecord;
+import com.wwdz.ch.db.domain.openShop.OpenShopApplyOrder;
 import com.wwdz.ch.db.domain.openShop.OpenShopCostRecord;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
 import com.wwdz.ch.core.entity.DistributionOrderNoticeMsg;
@@ -127,6 +130,9 @@ public class WxPayCallbackController {
     @Autowired
     GuaranteeMoneyRecordDao guaranteeMoneyRecordDao;
 
+    @Autowired
+    OpenShopApplyOrderDao openShopApplyOrderDao;
+
     @RequestMapping(value ="/getPayNotify")
     public String payNotify(HttpServletRequest request) throws IOException {
         logger.info("------------------ 收到微信支付回调通知 ------------------");
@@ -558,6 +564,8 @@ public class WxPayCallbackController {
             openShopCostRecord.setEndValidTime(DateUtils.fromLocalDateTime(endValidTime));
             openShopCostRecord.setIsValid(true);
             openShopCostRecordDao.update(openShopCostRecord);
+            //申请单状态修改
+            openShopApplyOrderDao.updateState(systemOrderId, OpenShopApplyOrderEnum.StateEnum.PRE_AUDIT.getCode());
             logger.info(">>>>>>>>>>>> 开店费缴纳订单，微信支付回调通知处理成功 <<<<<<<<<<<<");
             return Result.success();
         } catch (Exception e) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/openShop/OpenShopServiceImpl.java

@@ -26,7 +26,6 @@ import com.wwdz.ch.db.dto.request.openShop.OpenShopApplyOrderRequestDto;
 import com.wwdz.ch.db.dto.request.openShop.OpenShopInfoRequestDto;
 import com.wwdz.ch.wx.impl.AiAssistantServiceImpl;
 import com.wwdz.ch.wx.service.openShop.OpenShopService;
-import com.wwdz.mall.common.util.CommonUtil;
 import com.xxdxxs.utils.EntityMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,12 +33,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+
 @Service
 public class OpenShopServiceImpl implements OpenShopService {
 
@@ -97,7 +96,6 @@ public class OpenShopServiceImpl implements OpenShopService {
             Date now = new Date();
             //月底修改为300
             long openShopAmount = 10000L;
-
             //创建申请单
             String orderId = IdUtils.getOrderNumber("OA");
             OpenShopApplyOrder openShopApplyOrder = new OpenShopApplyOrder();

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/openShop/OpenShopController.java

@@ -98,4 +98,18 @@ public class OpenShopController {
     }
 
 
+    @ApiOperation(value = "查询开店申请单")
+    @PostMapping("/findOpenShopApplyOrder")
+    public Result findOpenShopApplyOrder(@RequestBody OpenShopApplyOrderRequestDto dto) {
+        logger.info("查询开店申请单,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("userId", "用户id").must().number()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return openShopService.findOpenShopApplyOrder(dto);
+    }
+
+
 }