Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/impl/OrderResultBusinessImpl.java

@@ -186,6 +186,7 @@ public class OrderResultBusinessImpl implements OrderResultBusiness {
             List<LocalDate> orderDateList = (List)orderInfoList.stream().map(OrderInfo::getOrderDate).collect(Collectors.toList());
             List<OrderDetail> orderDetailList = this.orderDetailService.getOrderDetailList((List)orderIdList, (Collection)orderDateList);
             if (PayStateEnum.isPayingState(payResultPO.getTradeState())) {
+               LogUtil.info("ZZZ--支付中--更新订单状态");
                orderInfoList.forEach((s) -> {
                   this.orderInfoService.updateOrderState(s.getOrderId(), s.getOrderDate(), payResultPO.getTradeState(), (Integer)null, (Integer)null, (String)null);
                });

scripts_244/smart_canteen_bootstrap.yml

@@ -35,6 +35,16 @@ spring:
   messages:
     basename: "message_device,message_account,message_adapter,message_allocation,message_attendance,message_auth,message_common,message_customer,message_dorm,message_drp,message_kitchen,message_marketing,message_menu,message_merchant,message_notice,message_nutrition,message_open,message_order,message_pay,message_report,message_supermarket,message_backfield,message_bus"
     fallback-to-system-locale: false
+  redis:
+    redisson:
+      config: |
+        singleServerConfig:
+          address: "redis://${REDIS_HOST:localhost}:${REDIS_PORT:6379}"
+          password: 
+          database: 0
+        nettyThreads: 64
+  main:
+    allow-circular-references: true
   mq:
     type: ${MQ_TYPE:rabbitmq}
     namespace: __yunshitang__
@@ -96,6 +106,21 @@ system:
     max-upload-file-size: ${MAX_UPLOAD_FILE_SIZE:5}
   notify:
     unify-host: ${NOTIFY_UNIFY_HOST:}
+    notify-url: ${NOTIFY_UNIFY_URL:/dev-api/smart-canteen/api/v2/pay/ali/notify}
+  api-urls:
+    apimchwxqq: ${API_MCH_WX_QQ:https://api.mch.weixin.qq.com} #微信支付相关
+    apiwxqq: ${API_WX_QQ:https://api.weixin.qq.com} #微信公众平台
+    qyapiwxqq: ${QY_API_WX_QQ:https://qyapi.weixin.qq.com} #企业微信
+    apialipay: ${API_ALI_PAY:https://openapi.alipay.com/gateway.do} #支付宝
+    apidsalipay: ${API_DS_ALI_PAY:https://ds.alipay.com/} #外部跳转支付宝小程序接口url
+    dingtalkoapi: ${DING_TALK_API:https://oapi.dingtalk.com} #钉钉应用
+    sqbapi: ${SQB_API:https://vsi-api.shouqianba.com} #收钱吧
+    sqbqrapi: ${SQB_QR_API:https://qr.shouqianba.com/gateway} #收钱吧网关地址
+    alismsdomain: ${API_ALI_SMS_DOMAIN:dysmsapi.aliyuncs.com} #阿里云短信请求地址
+    feieapi: ${API_FEI_E:http://api.feieyun.cn} #飞鹅api
+  order:
+    call:
+      max-num: ${ORDER_CALL_MAX_NUM:999}
 
 data-config:
   sm4-key: ${SENSITIVE_SM4KEY:jY7bZz6Pjml+H/WZYfNSNA==}