去除非空返回错误

zhaowenxuan

2025-02-11 b4ac803e1554f70e556d94a1313d6944e5fc0e6f

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

@@ -7,11 +7,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TjProjectMapper;
import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.system.TjOrderController;
import com.ltkj.web.wxUtils.HttpClientUtils;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
@@ -58,6 +61,12 @@
    private TjProjectMapper tjProjectMapper;
    @Autowired
    private ISysConfigService sysConfigService;
    @Autowired
    private TjOrderController tjOrderController;
    @Autowired
    private ISysUserService userService;
    @Autowired
    private TjOrderYcxmService ycxmService;

    /**
     * 收退费回调接口
@@ -98,6 +107,13 @@
//                            wrapper1.set(TjSampling::getIsPay,1);
//                            tjSamplingService.update(wrapper1);
                        }
                        SysUser user = null;
                        if (water.getCreateId()!= null)
                            user = userService.getById(water.getCreateId());
                        else user = userService.getById(1L);
                        TjOrder tjOrder = orderService.getById(water.getOrderId());
                        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(water.getOrderId());
                        tjOrderController.addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, user, null);
                    }
                }else {
                    return AjaxResult.error("查不到流水号: "+feiYongId);
@@ -124,7 +140,7 @@
                        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);