修改

xuhy

2024-12-30 9e416a54d1788563f6e2a8857ad50638bf1b29cf

修改

 manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java

@@ -5,6 +5,7 @@
import com.jilongda.common.basic.PageInfo;
import com.jilongda.common.constants.WarehousingConstant;
import com.jilongda.common.utils.CodeGenerateUtils;
import com.jilongda.common.utils.TimeUtils;
import com.jilongda.manage.authority.model.SecUser;
import com.jilongda.manage.authority.service.SecUserService;
import com.jilongda.manage.model.*;
@@ -69,8 +70,6 @@
    @ApiOperation(value = "订单售后详情")
    @GetMapping(value = "/detail")
    public ApiResult<TOrderAftersalesDetailVO> detail(Integer id) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
        TOrderAftersales byId = orderAftersalesService.getById(id);
        TOrder byId1 = orderService.getById(byId.getOrderId());
        TStore byId2 = tStoreService.getById(byId1.getStoreId());
@@ -87,8 +86,8 @@
        res.setStoreName(byId2.getName());
        res.setOptometristName(byId5.getName());
        res.setSalesUser(byId3.getNickName());
        res.setOrderTime(simpleDateFormat.format(byId1.getCreateTime()));
        res.setAfterSalesTime(simpleDateFormat1.format(byId.getCreateTime()));
        res.setOrderTime(TimeUtils.localDateTimeToString(byId1.getCreateTime()));
        res.setAfterSalesTime(TimeUtils.localDateTimeToString(byId.getCreateTime()));
        List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, byId1.getId()).list();
        res.setGoodsList(list);
        res.setOrderMoney(byId1.getOrderMoney());

 manage/src/main/resources/mapping/TStoreMapper.xml

@@ -32,7 +32,7 @@
        from t_store
        <where>
            <if test="query.name != null and query.name != ''">
                and `name` like concat('%',#{name},'%')
                and `name` like concat('%',#{query.name},'%')
            </if>
            <if test="query.status != null">
                and `status` = #{query.status}