Merge branch '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: 5575ae098e3769d73fba04b7148e3b86547b06ed
+  newTag: 03375f956fab10f958d6dd0772f3d0b275fca3f8

src/main/java/com/mmc/oms/controller/demand/commit/NotRepeatSubmitConfig.java

@@ -110,8 +110,8 @@ public class NotRepeatSubmitConfig extends BaseController {
                             String orderNumber1 = releaseOrderDao.getOrderNumber(getOrderNumberDO.getRequirementsInfoId());
                             if (orderNumber1!=null){
                                 UserPayInfoVO userPayInfoVO = queryUserPayInfo(orderNumber1, request);
-                                if (userPayInfoVO.getTradeState()!="SUCCESS"){
-                                    releaseOrderDao.getDelete(getOrderNumberDO.getRequirementsInfoId());
+                                if (!userPayInfoVO.getTradeState().equals("SUCCESS")){
+                                  releaseOrderDao.getDelete(getOrderNumberDO.getRequirementsInfoId());
                                 }
                             }
                             int i = releaseOrderDao.selectOrderNumberDO(getOrderNumberDO.getRequirementsInfoId());