fix: 收款分佣

fs-api/src/main/java/com/fs/app/controller/PayController.java

@@ -122,18 +122,21 @@ public class PayController {
     }
     @ApiOperation("台州银行第三方退款回调")
     @PostMapping(value="/tzRefundNotify")
-    public String tzRefundNotify(HttpServletRequest request, TzRefundOrderDTO dto) throws Exception {
-        logger.info("台州银行第三方退款回调，请求参数: {}", JSON.toJSONString(dto));
+    public String tzRefundNotify(@RequestBody String  decryptForm) throws Exception {
+        TzConfigInfoDTO tzConfigInfoDTO = TzConfigUtils.getConfig();
 
-        if(dto.getRefundOrdStatus().equals("90")){
-            FsStorePayment storePayment=storePaymentService.selectFsStorePaymentByCode(dto.getRefundOrderNo());
-            if(storePayment!=null){
-                storePaymentService.refund(dto.getRefundOrderNo());
-                Long orderId = storePayment.getOrderId();
-                orderService.refundOrder(orderId);
-            }
-            return "success";
-        }
+        String decrypt = CallBackUtil.decrypt( tzConfigInfoDTO.getAppSecret(),decryptForm);
+        logger.info("台州银行第三方退款回调，请求参数: {}", JSON.toJSONString(decrypt));
+
+//        if(dto.getRefundOrdStatus().equals("90")){
+//            FsStorePayment storePayment=storePaymentService.selectFsStorePaymentByCode(dto.getRefundOrderNo());
+//            if(storePayment!=null){
+//                storePaymentService.refund(dto.getRefundOrderNo());
+//                Long orderId = storePayment.getOrderId();
+//                orderService.refundOrder(orderId);
+//            }
+//            return "success";
+//        }
         return "success";
     }
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1652,20 +1652,25 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     logger.warn("当前支付记录不为已支付，已经跳过: paycode: {}",storePayment.getPayCode());
                     return "";
                 }
-                FsStorePayment storePaymentMap=new FsStorePayment();
-                storePaymentMap.setPaymentId(storePayment.getPaymentId());
-                storePaymentMap.setStatus(1);
-                storePaymentMap.setPayTime(new Date());
-                storePaymentMap.setTradeNo(tradeNo);
-                storePaymentMap.setBankSerialNo(bankSerialNo);
-                storePaymentMap.setBankTransactionId(bankTransactionId);
-                paymentService.updateFsStorePayment(storePaymentMap);
-                order=fsStoreOrderMapper.selectFsStoreOrderById(storePayment.getOrderId());
-
-                if(order == null){
-                    logger.info("当前订单不存在! 可能为收款类型");
+                storePayment.setPaymentId(storePayment.getPaymentId());
+                storePayment.setStatus(1);
+                storePayment.setPayTime(new Date());
+                storePayment.setTradeNo(tradeNo);
+                storePayment.setBankSerialNo(bankSerialNo);
+                storePayment.setBankTransactionId(bankTransactionId);
+                paymentService.updateFsStorePayment(storePayment);
+
+                // 如果是收款
+                if(ObjectUtil.equal(1,storePayment.getBusinessType())){
+                    logger.info("支付确认 payCode: {} ，当前类型为收款类型!",payCode);
+                    companyService.addCompanyPaymentMoney(storePayment);
                     return "";
                 }
+
+
+                order=fsStoreOrderMapper.selectFsStoreOrderById(storePayment.getOrderId());
+
+
                 if(order!=null&&!order.getPaid().equals(0)){
                     throw new CustomException("当前订单未找到! paycode:"+payCode);
                 }