Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-admin/src/main/resources/application.yml

@@ -7,8 +7,8 @@ spring:
 #    active: dev-test
 #    active: druid-hdt
 #    active: druid-yzt
-#    active: druid-sxjz-test
+    active: druid-zkzh-test
 #    active: druid-sft
 #    active: druid-fby
-    active: dev
+#    active: dev
 

fs-company-app/src/main/resources/application.yml

@@ -5,5 +5,5 @@ server:
 # Spring配置
 spring:
   profiles:
-#    active: druid-fcky-test
-    active: druid-jnmy-test
+    active: druid-zkzh-test
+#    active: druid-ylrz

fs-company/src/main/resources/application.yml

@@ -3,8 +3,8 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-#    active: druid-jnsyj-test
+#    active: dev
+    active: druid-zkzh-test
 #    active: druid-jnmy-test
 #    active: druid-jzzx-test
 #    active: druid-hdt

fs-ipad-task/src/main/resources/application.yml

@@ -4,9 +4,9 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
+    active: dev-test
 #    active: druid-hdt
 #    active: druid-yzt
 #    active: druid-sxjz
 #    active: druid-sft
-group-no: 2
+group-no: 1

fs-service/src/main/java/com/fs/his/enums/PaymentMethodEnum.java

@@ -8,6 +8,8 @@ import lombok.Getter;
 public enum PaymentMethodEnum {
     MINIAPP_WECHAT("weixin"), // 小程序微信支付
     H5_WECHAT("微信"),      // H5微信支付
+    T_APP("t_app"),      // H5微信支付
+    T_NATIVE("t_native"),      // H5微信支付
     ALIPAY("alipay"),         // 支付宝支付
     H5_ALIPAY("alipay");       // H5支付宝支付
 

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -5717,7 +5717,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         payOrderParam.setCompanyId(order.getCompanyId());
         payOrderParam.setCompanyUserId(order.getCompanyUserId());
         payOrderParam.setPaymentMethod(paymentMethod);
-        payOrderParam.setBusinessType(BusinessTypeEnum.INTEGRAL_ORDER);
+        payOrderParam.setBusinessType(BusinessTypeEnum.ORDER_ORDER);
         return payOrderParam;
     }
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStorePaymentScrmServiceImpl.java

@@ -1129,7 +1129,9 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
 
         FsPayConfig payConfig=new FsPayConfig();
         //支付宝可以不需要appid（在没有appid的情况下）【ps:小程序的支付宝没传appid 就G】
-        if (PaymentMethodEnum.ALIPAY==payOrderParam.getPaymentMethod() && StringUtils.isBlank(payOrderParam.getAppId())){
+        if ((PaymentMethodEnum.ALIPAY==payOrderParam.getPaymentMethod()
+                ||PaymentMethodEnum.T_NATIVE==payOrderParam.getPaymentMethod())
+                && StringUtils.isBlank(payOrderParam.getAppId())){
             String json = configService.selectConfigByKey("his.pay");
             PayConfigDTO payConfigDTO = JSONUtil.toBean(json, PayConfigDTO.class);
             payConfig.setType(payConfigDTO.getType());
@@ -1260,6 +1262,9 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
             case ALIPAY:
             case H5_ALIPAY:
                 return "A_NATIVE";
+            case T_APP:
+            case T_NATIVE:
+                return "T_NATIVE";
             default:
                 throw new CustomException("不支持的支付方式");
         }

fs-service/src/main/resources/application-druid-heyantang.yml

@@ -151,6 +151,8 @@ openIM:
     secret: openIM123
     userID: imAdmin
     url: https://web.im.fbylive.com/api
+push:
+    url:
 #是否使用新im
 im:
     type: NONE

fs-user-app/src/main/java/com/fs/app/controller/app/AppController.java

@@ -61,4 +61,14 @@ public class AppController extends AppBaseController {
         param.setUserId(Long.parseLong(getUserId()));
         return fsStoreOrderScrmService.payment(param, PaymentMethodEnum.ALIPAY);
     }
+
+
+    @Login
+    @RepeatSubmit
+    @ApiOperation("微信支付")
+    @PostMapping("/wxPayment")
+    public R wxPayment(@Validated @RequestBody FsIntegralOrderDoPayParam param) {
+        param.setUserId(Long.parseLong(getUserId()));
+        return fsStoreOrderScrmService.payment(param, PaymentMethodEnum.T_NATIVE);
+    }
 }

fs-user-app/src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid-myhk-test
+    active: druid-zkzh-test
 #    active: dev
 #    active: druid-jzzx
 #    active: druid-yzt