20220505

xiaoyong931011

2022-05-05 1ab8dbb7e0912bdc0f89617ac8105ae974889d42

20220505

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java

@@ -36,7 +36,6 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.assertj.core.util.Arrays;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -200,7 +199,7 @@
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        SysOrder order = orderService.findById(id);
        order.setItems(orderItemDao.selectByOrderId(id));
        return AjaxResult.buildSuccessInstance(Arrays.asList(order));
        return AjaxResult.buildSuccessInstance(order);
    }

    @ApiOperation(value = "列表显示搜索项目绑定的产品信息", notes = "列表显示搜索项目绑定的产品信息")
@@ -243,7 +242,7 @@
        sysOrderResult.setZkTotal(zkTotal.setScale(2, BigDecimal.ROUND_DOWN).doubleValue());
        sysOrderResult.setTotal(total.doubleValue());

        return AjaxResult.buildSuccessInstance(java.util.Arrays.asList(sysOrderResult));
        return AjaxResult.buildSuccessInstance(sysOrderResult);
    }

    @ApiOperation(value = "订单支付", notes = "订单支付")
@@ -264,7 +263,7 @@
        asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG ,uniformMsgParam);

        //处理用户购买的产品
        return AjaxResult.buildSuccessInstance(java.util.Arrays.asList(sysOrder), "订单结算成功");
        return AjaxResult.buildSuccessInstance(sysOrder, "订单结算成功");
    }

    @ApiOperation(value = "订单保存接口-挂单", notes = "订单保存接口-挂单")
@@ -276,7 +275,7 @@
        //校验保存订单
        sysOrder = orderService.checkAndSaveOrder(sysOrder);
        //处理用户购买的产品
        return AjaxResult.buildSuccessInstance(java.util.Arrays.asList(sysOrder), "订单保存成功");
        return AjaxResult.buildSuccessInstance(sysOrder, "订单保存成功");
    }



 zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java

@@ -9,22 +9,22 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.dao.BizUserDao;
import com.matrix.system.fenxiao.entity.BizUser;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.SysBedInfoDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.hive.service.*;
import com.matrix.system.padApi.dto.PadOrderListDto;
import com.matrix.system.padApi.vo.PadOrderDetailVo;
import org.assertj.core.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -95,8 +95,22 @@

    @Autowired
    private SysBedInfoDao sysBedInfoDao;
    @Resource
    private SysOrderService orderService;
    @Autowired
    private BusParameterSettingsDao busParameterSettingsDao;
    @Autowired
    private SysOrderItemDao orderItemDao;

    @Test
    public void findOrderById() {
        Long id = 675L;
//        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        SysOrder order = orderService.findById(id);
        order.setItems(orderItemDao.selectByOrderId(id));
        System.out.println(Arrays.asList(order));
    }
    @Test
    public void testFrist(){
        SysUsers user = new SysUsers();
        user.setShopId(13L);