线上支付生成二维码配置

ship-module-trade/ship-module-trade-biz/pom.xml

@@ -180,6 +180,12 @@
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>ship-module-marketing-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeDetailDO.java

@@ -136,15 +136,6 @@ public class TradeDetailDO extends TenantBaseDO {
      */
     private Integer useRealName;
 
-    /**
-     * 打包产品ID
-     */
-    private Long packProductId;
-    /**
-     * 打包产品ID
-     */
-    private String packProductName;
-
     /**
      * 过闸头像
      */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/handler/PersonalDistributorHandler.java

@@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.json.JsonUtils;
 import com.yc.ship.framework.common.util.object.ObjectUtils;
 import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
 import com.yc.ship.framework.tenant.core.util.TenantUtils;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -838,6 +838,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                 tradeDetailDO.setActualPrice(orderDetail.getPrice());
                 tradeDetailDO.setSpecType(orderDetail.getSpecType());
                 tradeDetailDO.setId(IdWorker.getId());
+                tradeDetailDO.setProductType(orderDetail.getProductType());
                 tradeDetailDO.setVoucherCode(ticketNoList.get(i));
                 i++;
                 tradeDetailDO.setVoucherStatus(VoucherStatusEnum.INIT.getStatus());
@@ -896,7 +897,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         }
 
         final TradeOrderHotelDO finalTradeOrderHotelDO = tradeOrderHotelDO;
-        TradeOrderCreateReqDTO.PackProduct packProduct = getPackProduct(orderCreateReqDTO, orderItem.getPackProductId());
+//        TradeOrderCreateReqDTO.PackProduct packProduct = getPackProduct(orderCreateReqDTO, orderItem.getPackProductId());
         orderItem.getDetailList().forEach(orderDetail -> {
 
             List<String> ticketNoList = tradeUUCodeUtils.generateTicketNo(orderDetail.getCount());
@@ -909,10 +910,10 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                 if (finalTradeOrderHotelDO != null) {
                     tradeDetailDO.setHotelOrderId(finalTradeOrderHotelDO.getId());
                 }
-                if (packProduct != null) {
-                    tradeDetailDO.setPackProductId(packProduct.getPackProductId());
-                    tradeDetailDO.setPackProductName(packProduct.getPackProductName());
-                }
+//                if (packProduct != null) {
+//                    tradeDetailDO.setPackProductId(packProduct.getPackProductId());
+//                    tradeDetailDO.setPackProductName(packProduct.getPackProductName());
+//                }
 //                tradeDetailDO.setRoutePlanId(routePlanId);
 //                tradeDetailDO.setRoutePlanGroupType(routePlanGroupType);
 
@@ -1130,7 +1131,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                         //暂时不验证酒店产品
                         break;
                     } else {
-                        packProductPrice = getPackProductPrice(orderItem.getPackProductId(), Long.parseLong(orderItem.getProductId()), orderDetail.getSpecType());
+//                        packProductPrice = getPackProductPrice(orderItem.getPackProductId(), Long.parseLong(orderItem.getProductId()), orderDetail.getSpecType());
+                        packProductPrice = null;
                     }
 
                     price = packProductPrice == null ? (productSku == null ? BigDecimal.ZERO : productSku.getSalePrice()) : packProductPrice;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -891,7 +891,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             // 统计各规格数量
             AtomicReference<List<TradeDetailRespVO>> list = new AtomicReference<>(new ArrayList<>());
             List<TradeDetailRespVO> detaillist = tradeDetailMapper.getOrderIdDetail(spu.getId());
-            spu.setPackProductId(detaillist.get(0).getPackProductId());
+//            spu.setPackProductId(detaillist.get(0).getPackProductId());
             spu.setTotalNum(detaillist.size());
             List<TradeDetailRespVO> realDetaillist = detaillist.stream().filter(item -> item.getVoucherStatus()==1||item.getVoucherStatus()==2||item.getVoucherStatus()==3||item.getVoucherStatus()==6||item.getVoucherStatus()==8||item.getVoucherStatus()==9).collect(Collectors.toList());
             if(realDetaillist!=null && realDetaillist.size()>0) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/pay/impl/PayPlatServiceImpl.java

@@ -39,9 +39,12 @@ import static com.yc.ship.module.trade.enums.ErrorCodeConstants.PAY_PLAT_UNKNOWN
 @Slf4j
 public class PayPlatServiceImpl implements PayPlatService {
 
-    public String baseUrl="";
-    public String payNotifyUrl="";
-    public String refundNotifyUrl="";
+    @Value("${huilv.pay.base-url}")
+    public String baseUrl;
+    @Value("${huilv.pay.pay-notify-url}")
+    public String payNotifyUrl;
+    @Value("${huilv.pay.refund-notify-url}")
+    public String refundNotifyUrl;
 
     public static final String SUCCESS = "SUCCESS";
     public static final String FALSE = "FALSE";

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/pay/impl/TradeOrderPayServiceImpl.java

@@ -130,7 +130,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
                         TradeOrderPayDO tradeOrderPayDO = buildOrderPay(tradeOrder,payOrderReqVO);
                         payOrderReqVO.setStoreId(tradeOrder.getStoreId());
                         tradeOrderRepositoryService.savePayOrder(tradeOrderPayDO);
-
+                        payOrderReqVO.setAccountName(tradeOrder.getSourceName());
                         return doPayOrder(tradeOrderPayDO,payOrderReqVO);
                     }
                 }else{
@@ -156,9 +156,9 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
     @Override
     public CommonResult<?> handlePayNotify(Map<String, Object>  map) {
         TradeMchInfoDO tradeMchInfoDO = tradeOrderRepositoryService.getByMchId(MapUtil.getStr(map,"mchId"));
-        String resKey =tradeMchInfoDO.getResKey();
-        String checkSign = PayDigestUtil.getSign(map, resKey, "sign", "payParams", "openId", "subject", "device", "param1", "param2","billNo","billDate");
-        String retSign = (String) map.get("sign");
+//        String resKey =tradeMchInfoDO.getResKey();
+//        String checkSign = PayDigestUtil.getSign(map, resKey, "sign", "payParams", "openId", "subject", "device", "param1", "param2","billNo","billDate");
+//        String retSign = (String) map.get("sign");
 //        Asserts.isTrue(checkSign.equals(retSign),"支付通知验签失败");
         PayNotifyReqBO payNotifyReqSourceBO = new PayNotifyReqBO();
         final PayNotifyReqBO payNotifyReqBO = BeanUtil.fillBeanWithMap(map,payNotifyReqSourceBO,false);
@@ -551,12 +551,12 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
      * @return
      */
     private boolean needPayPlatCreateOrder(PayOrderReqVO payOrderReqVO,TradeOrderPayDO tradeOrderPayDO){
-//        boolean flag =  ObjectUtils.equalsAny(payOrderReqVO.getPayType(), PayTypeEnum.WEIXIN_PAY.getType(),PayTypeEnum.ALI_PAY.getType()
-//        ,PayTypeEnum.UNION_PAY.getType(),PayTypeEnum.BANK_CARD.getType());
-//        if(flag && (payOrderReqVO.getPayAmount().compareTo(BigDecimal.ZERO) == 0)){
-//            throw exception0(PAY_TYPE_NOT_SUPPORT_ZERO.getCode(),PAY_TYPE_NOT_SUPPORT_ZERO.getMsg());
-//        }
-        return false;
+        boolean flag =  ObjectUtils.equalsAny(payOrderReqVO.getPayType(), PayTypeEnum.WEIXIN_PAY.getType(),PayTypeEnum.ALI_PAY.getType()
+        ,PayTypeEnum.UNION_PAY.getType(),PayTypeEnum.BANK_CARD.getType());
+        if(flag && (payOrderReqVO.getPayAmount().compareTo(BigDecimal.ZERO) == 0)){
+            throw exception0(PAY_TYPE_NOT_SUPPORT_ZERO.getCode(),PAY_TYPE_NOT_SUPPORT_ZERO.getMsg());
+        }
+        return flag;
     }
 
     private TradeOrderPayDO buildOrderPay(TradeOrderDO tradeOrder,PayOrderReqVO payOrderReqVO){
@@ -586,13 +586,13 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
             return "0";
         }
 
-        if(payOrderReqVO.getPayType() == 1){
+        if(payOrderReqVO.getPayType() == 5){
             //预付款
             PayTypeEnum payTypeEnum = PayTypeEnum.valueOf(5);
             PayTypeService payTypeService = payTypeServiceMap.get(payTypeEnum.getServiceName());
             Asserts.isTrue(payTypeService!=null,"当前支付方式未实现{},{}",payTypeEnum.getServiceName(),payOrderReqVO.getPayType());
             return payTypeService.deduct(tradeOrderPayDO,payOrderReqVO).toString();
-        }else if(payOrderReqVO.getPayType() == 2){
+        }else if(payOrderReqVO.getPayType() == 6){
             //授信
             PayTypeEnum payTypeEnum = PayTypeEnum.valueOf(6);
             PayTypeService payTypeService = payTypeServiceMap.get(payTypeEnum.getServiceName());