Merge branch 'develop' of http://git.mmcuav.cn/iuav/oms into develop

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: 2683db210415ee5fa4139688031516da9601eaf1
+  newTag: 268e5bad07eedced4284cc91f39c56621f8cf699

src/main/java/com/mmc/oms/dao/CouponBackDao.java

@@ -17,6 +17,7 @@ public interface CouponBackDao extends BaseMapper<CouponDO> {
 
     List<CouponDO> selectCouponList(String date, String priority, Integer pageNo, Integer pageSize);
 
+
     Integer selectCouponCount(String date, String priority);
 
     ProductInformationDo findProduct(Integer goodsInfoId);

src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java

@@ -423,7 +423,7 @@ public class UavOrderServiceImpl implements UavOrderService {
             userPayUavWalletVO.setCashAmount(uavOrderDO.getShareAmount());
             userPayUavWalletVO.setOrderStatus(999);
             userPayUavWalletVO.setRemark("商城订单金额解冻");
-            ResultBody resultBody = userAppApi.feignPayUavWallet(userPayUavWalletVO, currentAccount.getToken());
+            ResultBody resultBody = userAppApi.feignPayUavWallet(userPayUavWalletVO, null);
             if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return resultBody;
@@ -450,7 +450,7 @@ public class UavOrderServiceImpl implements UavOrderService {
                 return managerRes;
             }
             payUavWalletVO.setUserAccountId((Integer) managerRes.getResult());
-            ResultBody resultBody = userAppApi.feignPayUavWallet(payUavWalletVO, currentAccount.getToken());
+            ResultBody resultBody = userAppApi.feignPayUavWallet(payUavWalletVO, null);
             if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return resultBody;
@@ -458,8 +458,11 @@ public class UavOrderServiceImpl implements UavOrderService {
             uavOrderDao.updateUavOrderProportion(uavOrderDO.getId(), UavOrderProportion.PROPORTION.intValue());
         }
         this.updateUavOrderStatus(id, UavOrderStatus.WAITING_RECEIVE_GOODS);
-        // 修改采购订单状态
-        uavPOService.receive(id);
+        // 意向订单才有采购订单
+        if (uavOrderDO.getOrderType().equals(UavOrderType.SIGN.getCode())) {
+            // 修改采购订单状态
+            uavPOService.receive(id);
+        }
         return ResultBody.success();
     }