buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
@@ -9,7 +9,10 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.lmk.domain.entity.UserCheckTemplate; import cn.lili.modules.lmk.enums.general.AdminRoleEnum; import cn.lili.modules.lmk.enums.general.TemplateContentTypeEnum; import cn.lili.modules.lmk.service.UserCheckTemplateService; import cn.lili.modules.member.entity.dto.MemberAddressDTO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.OrderPackage; @@ -27,7 +30,9 @@ import cn.lili.modules.system.entity.vo.Traces; import cn.lili.utils.COSUtil; import cn.lili.utils.CommonUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -70,6 +75,8 @@ @Autowired private AdminUserService adminUserService; @Autowired private UserCheckTemplateService userCheckTemplateService; @ApiOperation(value = "查询会员订单列表") @GetMapping public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) { @@ -103,6 +110,21 @@ orderSearchParams.setMemberId(currentUser.getId()); return ResultUtil.data(orderService.queryByXcxParams(orderSearchParams)); } @ApiOperation(value = "根据订单号查询定制模板填写信息") @GetMapping("/customize/{sn}") public ResultMessage<List<UserCheckTemplate>> customize(@PathVariable @NotBlank String sn) { LambdaQueryWrapper<UserCheckTemplate> eq = Wrappers.<UserCheckTemplate>lambdaQuery().eq(UserCheckTemplate::getOrderSn, sn); List<UserCheckTemplate> list = userCheckTemplateService.list(eq); for (UserCheckTemplate userCheckTemplate : list) { if (TemplateContentTypeEnum.IMAGE.name().equals(userCheckTemplate.getContentType())) { String content = userCheckTemplate.getContent(); if (StringUtils.isNotBlank(content)&&!content.contains("http")) { userCheckTemplate.setContent(cosUtil.getPreviewUrl(content)); } } } return ResultUtil.data(list); } @ApiOperation(value = "订单明细") @ApiImplicitParams({ buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
@@ -62,7 +62,9 @@ String orderSns = cashierParam.getOrderSns(); for (CustomizeTemplateForm customizeTemplateForm : templateForm) { UserCheckTemplate userCheckTemplate = new UserCheckTemplate(); userCheckTemplate.setContentType(customizeTemplateForm.getContentType()); userCheckTemplate.setChooseImg(payParam.getChooseImage()); userCheckTemplate.setChooseImgId(payParam.getChooseImageId()); userCheckTemplate.setTemplateName(payParam.getTemplateName()); userCheckTemplate.setTemplateId(payParam.getTemplateId()); userCheckTemplate.setOrderSn(orderSns); framework/src/main/java/cn/lili/modules/lmk/domain/entity/UserCheckTemplate.java
@@ -49,5 +49,9 @@ /** 选择模板图片 */ private String chooseImg; @TableField("content_type") /** 模板文本类型 */ private String contentType; } framework/src/main/java/cn/lili/modules/lmk/domain/form/CustomizeTemplateForm.java
@@ -16,4 +16,7 @@ /** 子模板值*/ private String value; /** 子模板类型*/ private String contentType; } framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java
@@ -160,6 +160,12 @@ @ApiModelProperty(value = "是否是礼品卡") private String couponFlag; /** * @see cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum */ @ApiModelProperty(value = "是否是定制商品") private String customizeFlag; private int i = 0; public List<OrderItemVO> initOrderItems() { if (CharSequenceUtil.isEmpty(groupGoodsId)) { framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -145,7 +145,7 @@ * @return 简短订单分页 */ @Select("select o.id,o.sn,o.flow_price,o.create_time,o.order_status,o.pay_status,o.payment_method,o.payment_time,o.member_name,o.store_name as " + "store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark,o.coupon_flag " + "store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark,o.coupon_flag,o.customize_flag " + ",GROUP_CONCAT(oi.goods_id) as group_goods_id," + " GROUP_CONCAT(oi.sku_id) as group_sku_id," + " GROUP_CONCAT(oi.num) as group_num" +