fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -44,8 +44,10 @@ import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderAddBo;
 import com.zhongzheng.modules.top.goods.bo.TopOldOrderCheckBo;
+import com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo;
 import com.zhongzheng.modules.top.goods.bo.TopOrderRefundApplyBo;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
+import com.zhongzheng.modules.top.order.bo.PayOrderCallBackBo;
 import com.zhongzheng.modules.wx.bo.WxInfoBo;
 import com.zhongzheng.modules.wx.bo.WxInfoQuery;
 import com.zhongzheng.modules.wx.bo.WxServerBody;
@@ -116,4 +118,26 @@ public class CommonController extends BaseController {
 //        }
         return toAjax(iTopOldOrderService.insertByAddBo(bo) ? 1 : 0);
     }
+
+    /**
+     * 新增诺税通开单记录
+     */
+    @ApiOperation("付款企业网银")
+    @PreAuthorize("@ss.hasPermi('system:log:add')")
+    @Log(title = "付款企业网银", businessType = BusinessType.INSERT)
+    @PostMapping("/payToCompany")
+    public AjaxResult<Void> payToCompany(@RequestBody TopOldOrderQueryBo bo) {
+        return toAjax(iTopOldOrderService.payToCompany(bo) ? 1 : 0);
+    }
+
+    @ApiOperation("付款企业网银支付回调")
+    @PreAuthorize("@ss.hasPermi('system:log:add')")
+    @Log(title = "付款企业网银支付回调", businessType = BusinessType.INSERT)
+    @PostMapping("/payToCompanyCallBack")
+    public AjaxResult<Void> payToCompanyCallBack(@RequestBody PayOrderCallBackBo bo) {
+        if(!ToolsUtils.checkSignCwSnFromOldSys(bo.getMainUniqueId(),bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return toAjax(iTopOldOrderService.payToCompanyCallBack(bo) ? 1 : 0);
+    }
 }

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -156,3 +156,6 @@ Nuonuo:
 oldOrder:
     studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
     orderCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/AuditUnderOrder
+
+oldSys:
+    host: http://gdxypx.xy.com

zhongzheng-admin-saas/src/main/resources/application-prod.yml

@@ -152,3 +152,6 @@ Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
+
+oldSys:
+    host: https://www.xyyxt.net

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -157,3 +157,6 @@ Nuonuo:
 oldOrder:
     studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
     orderCheck: http://gdxypx.xy.com/WitSystem/BussinessApi/AuditUnderOrder
+
+oldSys:
+    host: http://gdxypx.xy.com

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -152,3 +152,6 @@ Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
+
+oldSys:
+    host: https://www.xyyxt.net

zhongzheng-api/src/main/resources/application-dev.yml

@@ -157,4 +157,7 @@ Nuonuo:
     APPSecret: SD168A248B2844E0
 
 oldOrder:
-    studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
+    studyRecord: http://gdxypx.xy.com/WitSystem/BussinessApi/GetStudyRecord
+
+oldSys:
+    host: http://gdxypx.xy.com

zhongzheng-api/src/main/resources/application-prod.yml

@@ -164,3 +164,6 @@ Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
     APPkey: 39149760
     APPSecret: 07168A248B2844E0
+
+oldSys:
+    host: https://www.xyyxt.net

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderService.java

@@ -8,6 +8,8 @@ import com.zhongzheng.modules.top.goods.domain.TopOldOrder;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderGoodsListVo;
 import com.zhongzheng.modules.top.goods.vo.TopOldOrderVo;
 import com.zhongzheng.modules.top.goods.vo.TopOrderStatisticsVo;
+import com.zhongzheng.modules.top.order.bo.PayOrderCallBackBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderExportVo;
 import com.zhongzheng.modules.top.goods.vo.TopRefundOrderDetailVo;
 
@@ -94,4 +96,7 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 
 	boolean updateOrderCost(TopUpdateCostBo bo);
 
+	Boolean payToCompany(TopOldOrderQueryBo bo);
+
+	Boolean payToCompanyCallBack(PayOrderCallBackBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderCheckLogServiceImpl.java

@@ -148,7 +148,7 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
     public void consentCheck(TopOldOrderCheckLog checkLog, TopOldOrderCheckLogEditBo bo) {
         List<TopOldOrderCheckLog> checkLogList = list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                         .eq(TopOldOrderCheckLog::getOrderSn, checkLog.getOrderSn())
-                        .eq(TopOldOrderCheckLog::getType, 1)//审核
+                        .eq(TopOldOrderCheckLog::getType, 5)//分成审核
                         .eq(TopOldOrderCheckLog::getStatus, 1)
                         .eq(TopOldOrderCheckLog::getCheckFrom, checkLog.getCheckFrom()));
         checkLog.setCheckTime(DateUtils.getNowTime());
@@ -159,26 +159,21 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
         updateById(checkLog);
 
         Integer maxSort = checkLogList.stream().mapToInt(TopOldOrderCheckLog::getCheckSort).max().getAsInt();
-        Integer periodStatus = 0;
-        Integer refundStatus = 0;
         if (checkLog.getCheckSort() < maxSort) {
             //下个审核进入默认
             update(new LambdaUpdateWrapper<TopOldOrderCheckLog>()
                     .set(TopOldOrderCheckLog::getCheckSign, 1)
                     .set(TopOldOrderCheckLog::getCheckStatus, 0)
                     .eq(TopOldOrderCheckLog::getOrderSn, checkLog.getOrderSn())
-                    .eq(TopOldOrderCheckLog::getType, 1)//审核
+                    .eq(TopOldOrderCheckLog::getType, 5)//审核
                     .eq(TopOldOrderCheckLog::getCheckSort, checkLog.getCheckSort() + 1)
                     .eq(TopOldOrderCheckLog::getCheckFrom, checkLog.getCheckFrom()));
-            refundStatus = 1;//退款中
-            periodStatus = 1;//审核中
         } else {
             //最后一个审核
-            periodStatus = 2;//待退款
             //进入支付流程
             TopOldOrderCheckLog check = getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                             .eq(TopOldOrderCheckLog::getRefundSn, checkLog.getRefundSn())
-                            .eq(TopOldOrderCheckLog::getType, 2)//支付
+                            .eq(TopOldOrderCheckLog::getType, 6)//分成支付
                             .eq(TopOldOrderCheckLog::getStatus, 1)
                             .eq(TopOldOrderCheckLog::getCheckFrom, checkLog.getCheckFrom())
                             .orderByAsc(TopOldOrderCheckLog::getCheckSort)
@@ -196,7 +191,7 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
     public void refuseCheck(TopOldOrderCheckLog checkLog, TopOldOrderCheckLogEditBo bo) {
         List<TopOldOrderCheckLog> checkLogList = list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                 .eq(TopOldOrderCheckLog::getOrderSn, bo.getOrderSn())
-                .eq(TopOldOrderCheckLog::getType, 1)//审核
+                .eq(TopOldOrderCheckLog::getType, 5)//审核
                 .eq(TopOldOrderCheckLog::getStatus, 1)
                 .eq(TopOldOrderCheckLog::getCheckFrom, checkLog.getCheckFrom()));
 
@@ -213,7 +208,7 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
                     .set(TopOldOrderCheckLog::getCheckSign, 1)
                     .set(TopOldOrderCheckLog::getCheckStatus, 0)
                     .eq(TopOldOrderCheckLog::getOrderSn, checkLog.getOrderSn())
-                    .eq(TopOldOrderCheckLog::getType, 1)//审核
+                    .eq(TopOldOrderCheckLog::getType, 5)//审核
                     .eq(TopOldOrderCheckLog::getCheckSort, checkLog.getCheckSort() - 1)
                     .eq(TopOldOrderCheckLog::getCheckFrom, checkLog.getCheckFrom()));
         } else {

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -39,6 +39,8 @@ import com.zhongzheng.modules.top.goods.domain.*;
 import com.zhongzheng.modules.top.goods.mapper.TopOldOrderMapper;
 import com.zhongzheng.modules.top.goods.service.*;
 import com.zhongzheng.modules.top.goods.vo.*;
+import com.zhongzheng.modules.top.order.bo.PayOrderCallBackBo;
+import com.zhongzheng.modules.top.order.bo.TopOrderRecNoteAddBo;
 import com.zhongzheng.modules.top.user.domain.TopSysRole;
 import com.zhongzheng.modules.top.user.domain.TopSysUserRole;
 import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
@@ -133,6 +135,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Value("${oldOrder.orderCheck}")
     private String ORDER_CHECK;
 
+    @Value("${oldSys.host}")
+    private String OLD_SYS_HOST;
+
     @Override
     public TopOldOrderVo queryById(String orderSn) {
         //查询视图 v_top_order
@@ -1146,6 +1151,48 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         return true;
     }
 
+    @Override
+    public Boolean payToCompany(TopOldOrderQueryBo bo) {
+        //学习记录推送到旧系统
+
+        Map<String, String> params = new HashMap<>();
+        Long nowTime = DateUtils.getNowTime();
+        String ToBankConnetNum = "";
+        String orderSn = "10002304261108345450143";
+        String sign = ToolsUtils.EncoderByMd5(orderSn+nowTime.toString()+"pubilc2022");
+        params.put("stamp", nowTime.toString());
+        params.put("sign", sign);
+        params.put("MainUniqueId", orderSn);
+        params.put("ToBankAcount", "6214831150131511");
+        params.put("ToBankName", "吴极客");
+        params.put("ToBankTypeName", "招商银行深圳分行");
+        params.put("Money", "0.01");
+        params.put("TrainOrgId", "1");
+        if(Validator.isNotEmpty(ToBankConnetNum)){
+            params.put("ToBankConnetNum", ToBankConnetNum);
+        }
+        String respone = "";
+        System.out.println(params);
+        String path = OLD_SYS_HOST+"/WitSystem/BussinessApi/NeedToPay";
+        try {
+            respone = HttpUtils.postFormBody(path, params);
+            System.out.println(respone);
+            if (!respone.contains("\"Status\":true")) {
+
+                throw new CustomException("同步请求错误"+respone);
+            }
+        } catch (IOException e) {
+            throw new CustomException("同步请求错误"+e.getMessage());
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean payToCompanyCallBack(PayOrderCallBackBo bo) {
+        System.out.println(bo);
+        return true;
+    }
+
     @Override
     public List<TopOldOrderVo> queryReceiveList(TopOldOrderQueryBo bo) {
         List<TopOldOrderVo> list = this.baseMapper.queryReceiveList(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/PayOrderCallBackBo.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.top.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 订单收款提醒添加对象 top_order_rec_note
+ *
+ * @author hjl
+ * @date 2023-04-24
+ */
+@Data
+@ApiModel("支付回调")
+public class PayOrderCallBackBo {
+
+
+    @ApiModelProperty("新系统业务标识唯一id")
+    private String MainUniqueId;
+
+    @ApiModelProperty("支付金额")
+    private BigDecimal Money;
+
+    @ApiModelProperty("支付结果 1成功 0失败")
+    private Integer status;
+
+    @ApiModelProperty("时间戳")
+    private Long stamp;
+
+    @ApiModelProperty("签名")
+    private String sign;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("应付的旧系统机构id")
+    private String TrainOrgId;
+}