feat(order): 调整订单支付逻辑与商户信息字段类型- 注释掉订单支付参数获取逻辑，暂不调用支付接口- 模拟微信支付查询结果为成功状态，跳过实际查询

- 注释掉支付参数设置逻辑，延迟支付处理
- 修改 sys_depart 表中 system_type 字段类型为 Integer
-为 sys_depart 实体类增加商户相关字段：mchName、mchId、appid
-为 nm_order 表增加微信分账单号字段 profit_sharing_order_id
- 更新 sys_depart 表 system_type 字段类型为 int 类型- 增加商户全称、商户号、appid 等微信支付相关字段定义

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -1195,8 +1195,8 @@ public class OrderServiceImpl implements IOrderService {
         if ((ObjectUtil.isNotEmpty(appOrder.getOrderOrFree()) && appOrder.getOrderOrFree() == 1) || appOrder.getPrice().compareTo(BigDecimal.ZERO)== 0) {
             payForm.setOrPayOrder(0);
         } else {
-            Map<String, String> result = payment(appOrder.getId());
-            payForm.setParams(result);
+//            Map<String, String> result = payment(appOrder.getId());
+//            payForm.setParams(result);
 
             //发布任务到redission延迟队列(16分钟)
             String task = CommonConstant.ORDER_TIME_OUT_TASK_PREFIX + appOrder.getId();
@@ -1699,15 +1699,16 @@ public class OrderServiceImpl implements IOrderService {
         AppOrder appOrder = appOrderMapper.selectOne(Wrappers.<AppOrder>lambdaQuery().eq(AppOrder::getOrderCode, orderCode).last("limit 1"));
 
         //null代表查询失败 SUCCESS-成功 USERPAYING和ACCEPT为中间态 其他为支付失败
-        JSONObject res = weChatPayService.orderQueryByOutTradeNo(orderCode);
-        String s = res == null ? null : res.getString("trade_state");
+//        JSONObject res = weChatPayService.orderQueryByOutTradeNo(orderCode);
+//        String s = res == null ? null : res.getString("trade_state");
+        String s = "SUCCESS";
         if ("SUCCESS".equals(s) || appOrder.getOriginalPrice().compareTo(BigDecimal.ZERO)==0) {
 
             if (ObjectUtil.isNotEmpty(appOrder) && Objects.equals(appOrder.getOrderStatus(), CommonConstant.ORDER_STATUS_0)) {
                 appOrder.setOrderStatus(1);
                 appOrder.setPayTime(new Date());
                 appOrder.setPayStatus(1);
-                appOrder.setTransactionId(res.getString("transaction_id"));
+//                appOrder.setTransactionId(res.getString("transaction_id"));
                 appOrderMapper.updateById(appOrder);
                 List<AppOrderProInfo> proInfoList = appOrderProInfoMapper.selectList(Wrappers.<AppOrderProInfo>lambdaQuery().eq(AppOrderProInfo::getOrderId, appOrder.getId()));
                 if (CollUtil.isNotEmpty(proInfoList)) {
@@ -1924,10 +1925,11 @@ public class OrderServiceImpl implements IOrderService {
                 throw new JeecgBootException("当前订单已过期取消，请重新下单！");
             }
         }
-        Map<String, String> payment = payment(appOrderId);
+//        Map<String, String> payment = payment(appOrderId);
         payForm.setOrderId(appOrderId)
                 .setOrderCode(appOrder.getOrderCode())
-                .setParams(payment);
+//                .setParams(payment)
+        ;
         return payForm;
     }
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -56,7 +56,7 @@ public class SysDepart implements Serializable {
 	private String orgCode;
     /**系统商户类别（0-平台 1-商户 2-门店）*/
     @Excel(name="系统商户类别（0-平台 1-商户 2-门店）",width=15)
-    private String systemType;
+    private Integer systemType;
 	/**手机号*/
 	@Excel(name="手机号",width=15)
 	private String mobile;
@@ -95,6 +95,20 @@ public class SysDepart implements Serializable {
 	private Integer tenantId;
 	private String esignOrgId;
 	private String orgIdCardNum;
+
+    /**
+     * 商户全称（微信商户号主体）
+     */
+    private String mchName;
+    /**
+     * 商户号
+     */
+    private String mchId;
+    /**
+     * appid
+     */
+    private String appid;
+
 	/**是否有叶子节点: 1是0否*/
 	private Integer izLeaf;
 

updateSql.md

@@ -41,5 +41,6 @@ ALTER TABLE sys_depart ADD appid varchar(64) COMMENT 'appid' AFTER org_id_card_n
 ALTER TABLE sys_depart ADD system_type int COMMENT '系统商户类别（0-平台 1-商户 2-门店）' AFTER org_code;
 
 nm_order增加字段：
-ALTER TABLE sys_depart ADD profit_sharing_status tinyint(1) COMMENT '分账状态（0-待分账 1-已分账 2-分账回退）' AFTER or_profit_sharing;
+ALTER TABLE nm_order ADD profit_sharing_status tinyint(1) COMMENT '分账状态（0-待分账 1-已分账 2-分账回退）' AFTER or_profit_sharing;
+ALTER TABLE nm_order ADD profit_sharing_order_id varchar(64) COMMENT '微信分账单号' AFTER transaction_id;