zjh20250625-2

zjh

9 天以前 69d28e586d9b67578725d4f82b2c393d43ef148d

 ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java

@@ -24,10 +24,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -90,6 +87,10 @@
                TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
                if(null !=water){
                    water.setPayStasus(1L);
                    water.setSfjs("1");
                    water.setJsrq(new Date());
                    water.setJsrxm("his回调");
                    water.setJsrdm("999");
                    if (tjFlowingWaterService.updateById(water)) {
                        String jxbz = water.getJxbz();
                        if(StringUtil.isNotBlank(jxbz)){
@@ -128,24 +129,35 @@
                    String bldh = water.getJxbz();
//                    lisRevoke(water.getTjNumber(),bldh);
                    if (bldh != null){
                        remarkService.deleteTjOrderDetailByjxbz(bldh);
                        remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),bldh,null);
/*                        remarkService.deleteTjOrderDetailByjxbz(bldh);
                        tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
                        tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
                        transitionService.deleteTjOrderDetailByjxbz(bldh);
                        blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, order.getTjNumber()).eq(TjProBl::getBldh, bldh));
                        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);
                        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);*/

                    }else {
                        tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
//                        TjCustomer customer = tjCustomerService.getById(order.getUserId());
//                        customer.setCardId("0");
//                        tjCustomerService.updateById(customer);

                       /* tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
                        tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
                        remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
                        tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
                        transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
                        ycxmService.delOrderYcXmJyByTjh(order.getTjNumber());
                        TjCustomer customer = tjCustomerService.getById(order.getUserId());
                        customer.setCardId("0");
                        tjCustomerService.updateById(customer);
                        tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
                        tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*/
//                        tjOrderService.removeById(order.getOrderId());

                        remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),null);
                    }
                    water.setPayStasus(2L);
                    water.setRefundPersonId("his回调");
                    water.setRefundTime(new Date());
                    water.setRefundPrice(water.getPaidIn());
                    tjFlowingWaterService.updateById(water);
                }
            }
        }