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

.gitlab-ci.yml

+stages:
+  - clean
+  - dockerbuild
+  - kustomize_tag_push
+
+variables:
+  REGION_id: cn-shenzhen
+  REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  IMAGE: oms
+  TAG: $CI_COMMIT_SHA
+  ACR_EE_USERNAME: QD--KeBiTeHangKong@1354706964800968
+  ACR_EE_PASSWORD: MMC@2023&ACR
+  ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
+  ACR_EE_IMAGE: oms
+  ACR_EE_TAG: $CI_COMMIT_SHA
+
+  JAVA_VERSION: '8'
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/oms.git
+
+mvn_clean:
+  stage: clean
+  script:
+    - echo "情理中..."
+    - mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+
+docker_build_dev:
+  stage: dockerbuild
+  variables:
+    NAMESPACE: sharefly-dev
+    ACR_EE_NAMESPACE: sharefly-dev
+  only:
+    - develop
+  script:
+    - echo "dev docker build"
+    - echo $ACR_EE_USERNAME
+    - echo $ACR_EE_REGISTRY
+    - mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
+    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
+    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
+    - docker logout
+
+docker_build_prod:
+  stage: dockerbuild
+  variables:
+    NAMESPACE: sharefly
+    ACR_EE_NAMESPACE: sharefly
+  only:
+    - master
+  script:
+    - echo "prod docker build"
+    - echo $ACR_EE_USERNAME
+    - echo $ACR_EE_REGISTRY
+    - mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
+    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
+    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
+    - docker logout
+
+
+kustomize_set_image_dev:
+  stage: kustomize_tag_push
+  variables:
+    NAMESPACE: sharefly-dev
+    ACR_EE_NAMESPACE: sharefly-dev
+  only:
+    - develop
+  before_script:
+    - echo "dev set image"
+    - git config --global user.name "bax" #配置本地仓库用户名信息
+    - git config --global user.email "baoaxin1999@163.com" #配置本地仓库邮箱信息
+  script:
+    - git remote -v
+    - git checkout -B develop
+    - cd kustomization/overlays/dev
+    - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+    - cat kustomization.yaml
+    - git remote set-url origin "$GITLAB_URL"
+    - git commit -am '[skip ci] DEV image update'  #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
+    - git push --set-upstream origin develop  #重新提交修改镜像版本后的代码
+
+
+
+kustomize_set_image_prod:
+  stage: kustomize_tag_push
+  variables:
+    NAMESPACE: sharefly
+    ACR_EE_NAMESPACE: sharefly
+  only:
+    - master
+  before_script:
+    - echo "prod set image"
+    - echo "master"
+    - git config --global user.name "bax" #配置本地仓库用户名信息
+    - git config --global user.email "baoaxin1999@163.com" #配置本地仓库邮箱信息
+  script:
+    - git remote -v
+    - git checkout -B master
+    - cd kustomization/overlays/prod
+    - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+    - cat kustomization.yaml
+    - git remote set-url origin "$GITLAB_URL"
+    - git commit -am '[skip ci] DEV image update'  #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
+    - git push --set-upstream origin master  #重新提交修改镜像版本后的代码

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: e98e60288c8f32327be578ceb98c077ea6884cf7

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();
     }