Merge remote-tracking branch 'origin/demo_' into demo_

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -592,38 +592,40 @@ public class YongyouServiceImpl implements YongyouService {
 
     @Override
     public String deletePurchaseOrder(String id) {
-        LongYanPurchaseOrder order = new LongYanPurchaseOrder();
-        order.setYongYouId(id);
-        List<LongYanPurchaseOrder> list =  longYanPurchaseOrderMapper.select(order);
-        if (list==null || list.size()==0 ||list.size()>1){
-            throw new BusinessException("系统有误，请联系管理员！");
-        }
-
-        DeletePurchaseOrderRequest request = new DeletePurchaseOrderRequest();
-        request.setCcode(list.get(0).getYongYouId());
-        request.setTradeID("");
-        // 正式环境代码开始
-        /*request.setToken(geToken(list.get(0).getOldOrNew()));
-        request.setCAcc_ID(getCAccId2(list.get(0).getOldOrNew()));
-        request.setConn(getConn2(list.get(0).getOldOrNew()));*/
-        // 正式环境代码结束
-        // 测试环境代码开始
-        request.setToken(geTokenTest());
-        request.setCAcc_ID(getCAccIdTest());
-        request.setConn(getConnTest());
-        // 测试环境代码结束
-        DeletePurchaseOrderHandler handler = new DeletePurchaseOrderHandler();
-        handler.setRequest(request);
-        String responseStr = handler.handler();
-        DeletePurchaseOrderResponse response = JSONObject.parseObject(responseStr,DeletePurchaseOrderResponse.class);
-        if (response.getResult()){
-            longYanPurchaseOrderMapper.delete(list.get(0));
+        LongYanPurchaseOrder order = longYanPurchaseOrderMapper.selectByPrimaryKey(id);
+        if (StringUtils.isBlank(order.getYongYouId())){
+            // 直接删除
+            longYanPurchaseOrderMapper.deleteByPrimaryKey(id);
             LongYanPurchaseDetail detail = new LongYanPurchaseDetail();
-            detail.setLongYangPurchaseOrderId(list.get(0).getId());
+            detail.setLongYangPurchaseOrderId(id);
             longYanPurchaseDetailMapper.delete(detail);
+            return "删除成功";
+        }else{
+            DeletePurchaseOrderRequest request = new DeletePurchaseOrderRequest();
+            request.setCcode(order.getYongYouId());
+            request.setTradeID("");
+            // 正式环境代码开始
+            /*request.setToken(geToken(list.get(0).getOldOrNew()));
+            request.setCAcc_ID(getCAccId2(list.get(0).getOldOrNew()));
+            request.setConn(getConn2(list.get(0).getOldOrNew()));*/
+            // 正式环境代码结束
+            // 测试环境代码开始
+            request.setToken(geTokenTest());
+            request.setCAcc_ID(getCAccIdTest());
+            request.setConn(getConnTest());
+            // 测试环境代码结束
+            DeletePurchaseOrderHandler handler = new DeletePurchaseOrderHandler();
+            handler.setRequest(request);
+            String responseStr = handler.handler();
+            DeletePurchaseOrderResponse response = JSONObject.parseObject(responseStr,DeletePurchaseOrderResponse.class);
+            if (response.getResult()){
+                longYanPurchaseOrderMapper.delete(order);
+                LongYanPurchaseDetail detail = new LongYanPurchaseDetail();
+                detail.setLongYangPurchaseOrderId(order.getId());
+                longYanPurchaseDetailMapper.delete(detail);
+            }
+            return response.getMsg();
         }
-
-        return response.getMsg();
     }
 
     @Override