Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

2024-05-08 11:50:39 +08:00
parent b31c93fb96 bcba7edd1e
commit 9763c737d3
53 changed files with 1285 additions and 237 deletions
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
@@ -48,6 +48,7 @@ public class TokenValidateFilter implements Filter {
                    "/**/swagger*/**", "/**/webjars/**",
                    //腾讯音视频回调，单独做验签
                    "/xfsg/pc/video/**",
+                    "/xfsg/pc/vod/callback",
                    "/xfsg/pc/sysRole/**",
                    "/xfsg/**/api/audit/result",
                    "/xfsg/pc/video/**",
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java
@@ -35,9 +35,11 @@ public class KdzApiController {
        log.info("auditResult requestBody :{}", JSONObject.toJSONString(request));
        //todo 暂时去掉验签测试
 //        if(!verifyMD5(request,eid)){
+//        log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid);
 //            return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE);
 //        }
 //        if(eid == null || request.getBizContent() == null){
+//        log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent()));
 //            return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
 //        }
        AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class);
@@ -50,9 +52,11 @@ public class KdzApiController {
                                                      @RequestBody XfsgOpenApiRequest request) {
        log.info("auditResult requestBody :{}", JSONObject.toJSONString(request));
        if(!verifyMD5(request,eid)){
+            log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid);
            return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE);
        }
        if(eid == null || request.getBizContent() == null){
+            log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent()));
            return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
        }
        LicenseBizContentRequest storeNum = JSONObject.parseObject(request.getBizContent(), LicenseBizContentRequest.class);
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
@@ -3,6 +3,7 @@ package com.cool.store.controller.webb;
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dto.TransferLogDTO;
+import com.cool.store.enums.point.PayBusinessTypeEnum;
 import com.cool.store.request.*;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.LinePayService;
@@ -127,7 +128,7 @@ public class LineInfoController {
            @ApiImplicitParam(name = "lineId", value = "线索id", required = true)
    })
    public ResponseResult<LinePayVO> getLinePayInfo(@RequestParam("lineId")Long lineId) {
-        return ResponseResult.success(linePayService.getLinePayInfo(lineId));
+        return ResponseResult.success(linePayService.getLinePayInfo(lineId, PayBusinessTypeEnum.INTENT_MONEY.getCode(),null));
    }

    @ApiOperation("线索流程进度")
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java
@@ -29,7 +29,15 @@ public class PCApplyLicenseController {

    @GetMapping(path = "/licenseList")
    @ApiOperation("证照审批列表")
-    public ResponseResult<PageInfo<LicenseListResponse>> licenseList(LicenseListRequest request) {
+    public ResponseResult<PageInfo<LicenseListResponse>> licenseList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
+                                                                     @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,
+                                                                     @RequestParam(value = "storeName",required = false)String storeName,
+                                                                     @RequestParam(value = "submitStartTime",required = false)Long  submitStartTime,
+                                                                     @RequestParam(value = "submitEndTime",required = false)Long  submitEndTime,
+                                                                     @RequestParam(value = "regionId",required = false)String regionId,
+                                                                     @RequestParam(value = "status",required = false)Integer status) {
+        LicenseListRequest request =
+                new LicenseListRequest(pageNumber,pageSize, storeName, submitStartTime, submitEndTime, regionId, status);
        return ResponseResult.success(applyLicenseService.licenseList(request));
    }

@@ -46,7 +54,7 @@ public class PCApplyLicenseController {
     * @return
     */
    @GetMapping(path = "/examine")
-    @ApiOperation("证照审批列表")
+    @ApiOperation("证照审批")
    public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
                                         @RequestParam("status") Integer status,
                                         @RequestParam("result") String result) {
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java
@@ -47,7 +47,7 @@ public class PCOpenPreparationController {
    private OpeningOperationPlanService openingOperationPlanService;
    @Resource
    private AuditOpeningOperationPlanService auditOpeningOperationPlanService;
-    @ApiOperation("刷新")
+    @ApiOperation("刷新订货金状态")
    @GetMapping("/flush")
    public ResponseResult<Boolean> flush(@RequestParam("shopId") Long shopId) {
        return ResponseResult.success(openingOperationPlanService.flush(shopId));
@@ -67,6 +67,7 @@ public class PCOpenPreparationController {
    @PostMapping("/openingOperationPlan/planList")
    @ApiOperation("查询运营方案列表")
    public ResponseResult<PageInfo<OpeningOperationPlanListVO>> planList(@RequestBody PlanListRequest request) {
+
        return ResponseResult.success(openingOperationPlanService.getPlanListPage(request));
    }
    @PostMapping("/openingOperationPlan/audit")
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VodController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VodController.java
@@ -0,0 +1,46 @@
+package com.cool.store.controller.webb;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.cool.store.service.VodService;
+import com.cool.store.utils.vod.AliResponseUtil;
+import com.cool.store.utils.vod.CallbackRequest;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * @author byd
+ * @date 2024-05-07 19:13
+ */
+@RestController
+@RequestMapping("pc/vod")
+@Api(tags = "视频回调接口")
+@Slf4j
+public class VodController {
+
+    @Autowired
+    private VodService vodService;
+
+    @RequestMapping("callback")
+    public JSONObject callback(HttpServletRequest request) throws IOException {
+        log.info("=================================");
+        log.info("VOD视频回调");
+        String cl = request.getHeader("content-length");
+        log.info("content-length:" + cl);
+        String vodCallbackBody = AliResponseUtil.GetPostBody(request.getInputStream(), Integer.parseInt(cl));
+        log.info("vodCallbackBody:" + vodCallbackBody);
+        CallbackRequest callback = JSON.parseObject(vodCallbackBody, CallbackRequest.class);
+        log.info("callback" + JSON.toJSONString(callback));
+        vodService.callback(callback);
+        log.info("=================================");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("Status", "OK");
+        return jsonObject;
+    }
+}
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java
@@ -1,6 +1,7 @@
 package com.cool.store.controller.webc;

 import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.enums.point.PayBusinessTypeEnum;
 import com.cool.store.request.LinePaySubmitRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.LinePayService;
@@ -35,7 +36,7 @@ public class LinePayController {
            @ApiImplicitParam(name = "lineId", value = "线索id", required = true)
    })
    public ResponseResult<LinePayVO> getLinePayInfo(@RequestParam("lineId")Long lineId) {
-        return ResponseResult.success(linePayService.getLinePayInfo(lineId));
+        return ResponseResult.success(linePayService.getLinePayInfo(lineId, PayBusinessTypeEnum.INTENT_MONEY.getCode(),null));
    }

    @ApiOperation("缴纳意向金/加盟费")
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java
@@ -41,7 +41,7 @@ public class MiniDecorationController {
    private DecorationService decorationService;
    @Resource
    private AssessmentTemplateService assessmentTemplateService;
-    @ApiOperation("获取新店装修下阶段的数据")
+    @ApiOperation("获取新店装修下阶段的数据/flush")
    @GetMapping("/getFitmentSub")
    public ResponseResult<FitmentResponse> getFitmentSub(@RequestParam Long shopId) {
        return ResponseResult.success(decorationService.getFitmentSub(shopId));
@@ -64,7 +64,7 @@ public class MiniDecorationController {
    @ApiOperation("获取装修款信息,和二维码")
    @GetMapping("/getDecorationModel")
    public ResponseResult<DecorationModelDTO> getDecorationModel(@RequestParam Long shopId){
-        return ResponseResult.success(decorationService.DecorationModel(shopId)) ;
+        return ResponseResult.success(decorationService.decorationModel(shopId)) ;
    }
    @ApiOperation("获取装修款阶段信息")
    @GetMapping("/getDecorationModeStage")
--- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
@@ -124,6 +124,7 @@ public class XxlJobHandler {

        while (hasNext) {
            log.info("----查询更新订货金----");
+            //sql 判定传入
            Page<Long> shopIdListByStageStatus = shopStageInfoDAO.getShopIdListByStageStatus(PageNum, PageSize);
            if (CollectionUtils.isEmpty(shopIdListByStageStatus)) {
                log.info("------今日没有待更新数据------");
@@ -135,12 +136,13 @@ public class XxlJobHandler {
            for (Long shopId : map.keySet()) {
                String shopCode = map.get(shopId);
                try {
+                    // TOdo 能不能一次调用
                    Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);

                    if (firstOrder == null) {
                        throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER);
                    }
-                    if (firstOrder.equals(Boolean.TRUE)) {
+                    if (firstOrder) {
                        shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null);
                        preparationService.whetherToOpenForAcceptance(shopId);
                    }
@@ -177,6 +179,7 @@ public class XxlJobHandler {
            }
            List<AcceptanceInfoDO> acceptanceInfoDOS = new ArrayList<>();
            for (Long shopId : shops) {
+                //TODO ids查
                acceptanceInfoDOS.add(acceptanceInfoDAO.selectByShopId(shopId));
            }
            for (AcceptanceInfoDO acceptanceInfoDO : acceptanceInfoDOS) {
@@ -214,6 +217,7 @@ public class XxlJobHandler {
                        LocalDate localDate = instant.atZone(zone).toLocalDate();
                        LocalDate datePlusFiveDays = localDate.plusDays(CommonConstants.FOUR);  // 添加5天
                        LocalDate now = LocalDate.now();
+                        //TODO 时间问题
                        if (datePlusFiveDays.equals(now)) {
                            shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120);
                        }