提交 order 支持 appletb

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/AbstractWepayStrategy.java

@@ -156,7 +156,12 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
     protected SortedMap<String, Object> buildRequestParamMap(DragonPayBaseReqDto dragonPayBaseReqDto){
         String nonceStr = PayWepayUtils.getInstance().getNonceStr();
         SortedMap<String, Object> parameters = new TreeMap<>();
-        parameters.put("mch_id", PayWepayUtils.getInstance().getMerchantId());
+//        parameters.put("mch_id", PayWepayUtils.getInstance().getMerchantId());
+        if(dragonPayBaseReqDto.getAppIdType().equals("b")){
+            parameters.put("mch_id", PayWepayUtils.getInstance().getMerchantBId());
+        }else{
+            parameters.put("mch_id", PayWepayUtils.getInstance().getMerchantId());
+        }
         parameters.put("nonce_str", nonceStr);
         parameters.put("spbill_create_ip", dragonPayBaseReqDto.getClientIp());
         parameters.put("total_fee", dragonPayBaseReqDto.getPrice().multiply(BigDecimal.valueOf(100L)).intValue()+"");

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrdersServiceImpl.java

@@ -66,6 +66,10 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
             return ResponseDto.failure("微信支付openId不能为空!");
         }
         //设置支付编号
+        if(dragonPayBaseReqDto.getDeviceFrom().equals("appletb")){
+            dragonPayBaseReqDto.setDeviceFrom("applet");
+            dragonPayBaseReqDto.setAppIdType("b");
+        }
         dragonPayBaseReqDto.setCode(IDGenerator.payCode());
         log.info("dragon:dragonPay:req:dragonPayBaseReqDto : {}",dragonPayBaseReqDto.toString());
         return payChannelStrategyContext.getStrategy(dragonPayBaseReqDto.getPayType()).dragonPay(dragonPayBaseReqDto);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -569,7 +569,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 orderTicketRelations.setAgentStatus(agentVo.getIsBlack() == 1 ? 2 : 1);
                 orderTicketRelations.setAgentIdMaster(agentVo.getAgentMasterId());
                 orderTicketRelations.setAgentDistributionsMaster(agentVo.getExCarry());
-            }else{
+            } else {
                 orderTicketRelations.setAgentDistributions(BigDecimal.ZERO);
                 orderTicketRelations.setAgentStatus(0);
                 orderTicketRelations.setAgentIdMaster("0");
@@ -683,7 +683,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
             dragonPayBaseReqDto.setPayType(payOrderParam.getPayType());
             dragonPayBaseReqDto.setDeviceFrom(payOrderParam.getDeviceFrom());
-            if (payOrderParam.getDeviceFrom().equals("js") || payOrderParam.getDeviceFrom().equals("applet")) {
+            if (payOrderParam.getDeviceFrom().equals("js") || payOrderParam.getDeviceFrom().equals("applet") || payOrderParam.getDeviceFrom().equals("appletb")) {
                 dragonPayBaseReqDto.setOpenId(payOrderParam.getOpenId());
             }
             dragonPayBaseReqDto.setType("TICKET");
@@ -703,7 +703,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             ResponseDto<DragonPayBaseRespDto> responseDto = dragonOrdersService.dragonPay(dragonPayBaseReqDto);
             String returnData = JsonUtils.toJson(responseDto);
 
-            log.debug("调用 DRAGON 结果 = " + returnData);
+            log.info("调用 DRAGON 结果 = " + returnData);
             payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
             payResultVo.getData().setOrderId(orderTicketId);
             payResultVo.getData().setPayType(orderTickets.getPayType());
@@ -812,7 +812,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
                 dragonPayBaseReqDto.setPayType(payAgainParam.getPayType());
                 dragonPayBaseReqDto.setDeviceFrom(payAgainParam.getDeviceFrom());
-                if (payAgainParam.getDeviceFrom().equals("js") || payAgainParam.getDeviceFrom().equals("applet")) {
+                if (payAgainParam.getDeviceFrom().equals("js") || payAgainParam.getDeviceFrom().equals("applet") || payAgainParam.getDeviceFrom().equals("appletb")) {
                     dragonPayBaseReqDto.setOpenId(payAgainParam.getOpenId());
                 }
                 dragonPayBaseReqDto.setType("TICKET");