Merge branch 'master' of http://8.210.64.198:30000/a258771316/ym-ipos

src/main/java/com/poteviohealth/ym/ipos/controller/MerchantController.java

@@ -52,12 +52,13 @@ public class MerchantController  extends BaseWebController {
     @PostMapping("/bindPos")
     @ApiOperation(value = "绑定终端")
     @OperationLog(type = OperateType.SELECT, description ="绑定终端")
-    public VaultsResponse bindPos() {
-        BindDto bd = new BindDto();
+    public VaultsResponse bindPos(@RequestBody BindDto bd) {
+
+       /* BindDto bd = new BindDto();
         bd.setAppId("wx0d821c4bde0e44b7");
         bd.setPosId("CHECG");
         bd.setStoreId("19");
-        bd.setName("(CHECG)中康养科技");
+        bd.setName("(CHECG)中康养科技");*/
         return paymentService.bindPos(bd);
     }
 

src/main/java/com/poteviohealth/ym/ipos/service/impl/SplitServiceImpl.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.poteviohealth.cgp.common.filter.TokenContext;
+import com.poteviohealth.cgp.common.integrated.LongParams;
+import com.poteviohealth.cgp.common.integrated.order.OrderFeignClient;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
 import com.poteviohealth.cgp.common.utils.CgpTool;
 import com.poteviohealth.ym.ipos.common.Basic;
@@ -47,6 +49,8 @@ public class SplitServiceImpl implements ISplitService {
     private ISplitRecordsDetailService splitRecordsDetailService;
     @Resource
     private ISplitWithdrawService splitWithdrawService;
+    @Resource
+    private OrderFeignClient orderFeignClient;
 
     @Override
     public VaultsResponse delayConfirm(SplitRecords records, List<SplitRecordsDetail> details) {
@@ -337,6 +341,13 @@ public class SplitServiceImpl implements ISplitService {
                     }
                 }
                 splitRecordsDetailService.updateBatchById(list2);
+
+                if(splitRecords.getStatus().equals(1)){
+                    LongParams params = new LongParams();
+                    params.setOperatorId(splitRecords.getOperatorId());
+                    params.setId(splitRecords.getSplitId());
+                    orderFeignClient.changeOrderDelayConfirm(params);
+                }
             }
             splitRecordsService.updateBatchById(list);