Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server into main

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/AppOtcTradeOrderController.java

@@ -69,7 +69,7 @@ public class AppOtcTradeOrderController {
     @OperateLog(type = TRADE)
     public CommonResult<PayOrderRespVO> miniAppPayOrder(@Valid @RequestBody PayOrderReqVO payOrderReqVO) {
 
-        return appOtcTradeOrderService.miniAppPayOrder(getLoginUser(), payOrderReqVO);
+        return appOtcTradeOrderService.miniAppPayOrder(agencyAuthUtils.getAgencyLoginUser(), payOrderReqVO);
     }
 
     @PostMapping("/miniApp/refund")

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

@@ -119,7 +119,9 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
             tradeOrderMapper.insert(tradeOrderBO.getTradeOrderDO());
             orderJzMapper.insert(tradeOrderBO.getOrderJzDO());
             tradeOrderUserMapper.insert(tradeOrderBO.getTradeOrderUserDO());
-            tradeOrderBindMapper.insert(tradeOrderBO.getTradeOrderBindDO());
+            if(tradeOrderBO.getTradeOrderBindDO()!=null) {
+                tradeOrderBindMapper.insert(tradeOrderBO.getTradeOrderBindDO());
+            }
             if(tradeOrderBO.getTradeOrderDeliveryDO() !=null) {
                 tradeOrderDeliveryMapper.insert(tradeOrderBO.getTradeOrderDeliveryDO());
             }
@@ -155,7 +157,9 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
             orderJzMapper.insert(tradeOrderBO.getOrderJzDO());
 
             tradeOrderBindMapper.update(new LambdaUpdateWrapper<TradeOrderBindDO>().set(TradeOrderBindDO::getDeleted, 1).set(TradeOrderBindDO::getUpdateTime,new Date()).eq(TradeOrderBindDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId()));
-            tradeOrderBindMapper.insert(tradeOrderBO.getTradeOrderBindDO());
+            if(tradeOrderBO.getTradeOrderBindDO()!=null) {
+                tradeOrderBindMapper.insert(tradeOrderBO.getTradeOrderBindDO());
+            }
 
             tradeOrderUserMapper.update(new LambdaUpdateWrapper<TradeOrderUserDO>().set(TradeOrderUserDO::getDeleted, 1).set(TradeOrderUserDO::getUpdateTime,new Date()).eq(TradeOrderUserDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId()));
             tradeOrderUserMapper.insert(tradeOrderBO.getTradeOrderUserDO());

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

@@ -805,10 +805,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderBO.setOrderJzDO(orderJzDO);
 
         TradeOrderBindDO tradeOrderBindDO = orderCreateReqDTO.getTradeOrderBindDO();
-        tradeOrderBindDO.setOrderId(tradeOrderDO.getId());
-        tradeOrderBindDO.setCreateTime(LocalDateTime.now());
-        tradeOrderBindDO.setCreator(tradeOrderDO.getCreator());
-        tradeOrderBO.setTradeOrderBindDO(tradeOrderBindDO);
+        if(tradeOrderBindDO != null) {
+            tradeOrderBindDO.setOrderId(tradeOrderDO.getId());
+            tradeOrderBindDO.setCreateTime(LocalDateTime.now());
+            tradeOrderBindDO.setCreator(tradeOrderDO.getCreator());
+            tradeOrderBO.setTradeOrderBindDO(tradeOrderBindDO);
+        }
 
 
         //订单联系人

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

@@ -370,10 +370,10 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
             return CommonResult.error(ORDER_PAY_TENAND_FAIL);
         }
         //当前旅行社信息
-        DistributorRespDTO distributorRespDTO = otaDistributorApi.getDistributorByAccountTenantId(loginUser.getTenantId()).getCheckedData();
-        payOrderReqVO.setAccountId(distributorRespDTO.getId().toString());
+//        DistributorRespDTO distributorRespDTO = otaDistributorApi.getDistributorByAccountTenantId(loginUser.getTenantId()).getCheckedData();
+//        payOrderReqVO.setAccountId(distributorRespDTO.getId().toString());
         payOrderReqVO.setAccountType(PayAccountTypeEnum.OTC.getType());
-        payOrderReqVO.setAccountName(distributorRespDTO.getName());
+//        payOrderReqVO.setAccountName(distributorRespDTO.getName());
 
         return tradeOrderPayService.payOrder(payOrderReqVO);
     }

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

@@ -2206,7 +2206,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
         BigDecimal price;
         if (createVO.getSummary().getOrderMoney() != null && createVO.getSummary().getOrderMoney().compareTo(new BigDecimal(0)) > 0) {
-            price = createVO.getSummary().getOrderMoney().subtract(spuMoney).divide(new BigDecimal(visitorList.size()), 2, RoundingMode.HALF_UP);
+            if(createVO.getSummary().getOrderMoney().compareTo(spuMoney) < 0){
+                price = BigDecimal.ZERO;
+            }else {
+                price = createVO.getSummary().getOrderMoney().subtract(spuMoney).divide(new BigDecimal(visitorList.size()), 2, RoundingMode.HALF_UP);
+            }
         } else {
             price = new BigDecimal(0);
         }
@@ -2430,9 +2434,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
         BigDecimal price;
         if (createVO.getSummary().getOrderMoney() != null && createVO.getSummary().getOrderMoney().compareTo(new BigDecimal(0)) > 0) {
-            price = createVO.getSummary().getOrderMoney().subtract(spuMoney).divide(new BigDecimal(visitorList.size()), 2, RoundingMode.HALF_UP);
+            if(createVO.getSummary().getOrderMoney().compareTo(spuMoney) < 0){
+                price = BigDecimal.ZERO;
+            }else {
+                price = createVO.getSummary().getOrderMoney().subtract(spuMoney).divide(new BigDecimal(visitorList.size()), 2, RoundingMode.HALF_UP);
+            }
         } else {
-            price = new BigDecimal(0);
+            price = BigDecimal.ZERO;
         }
         orderDetail.setPrice(price);
         orderDetail.setOriginPrice(price);