diff --git a/shell/start.sh b/shell/start.sh index f3a0c92e..fa305a27 100644 --- a/shell/start.sh +++ b/shell/start.sh @@ -1 +1 @@ -nohup java -jar yshop-api-1.9.jar --spring.profiles.active=prod & \ No newline at end of file +nohup java -jar yshop-api-2.0.jar --spring.profiles.active=prod & \ No newline at end of file diff --git a/shell/stop.sh b/shell/stop.sh index 9182c277..f87788a5 100644 --- a/shell/stop.sh +++ b/shell/stop.sh @@ -1,4 +1,4 @@ -PID=$(ps -ef | grep yshop-api-1.9.jar | grep -v grep | awk '{ print $2 }') +PID=$(ps -ef | grep yshop-api-2.0.jar | grep -v grep | awk '{ print $2 }') if [ -z "$PID" ];then echo Application is already stopped else diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java index e8f8a630..b78dc3a8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java @@ -273,7 +273,7 @@ public class StoreBargainController extends BaseController { return ApiResult.fail("未配置h5地址"); } String apiUrl = systemConfigService.getData("api_url"); - if(StrUtil.isEmpty(siteUrl)){ + if(StrUtil.isEmpty(apiUrl)){ return ApiResult.fail("未配置api地址"); } int uid = SecurityUtils.getUserId().intValue(); diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 2183183f..25531267 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -48,11 +48,9 @@ import co.yixiang.modules.shop.entity.YxStoreCart; import co.yixiang.modules.shop.entity.YxStoreCouponUser; import co.yixiang.modules.shop.mapper.YxStoreCartMapper; import co.yixiang.modules.shop.mapper.YxStoreCouponUserMapper; -import co.yixiang.modules.shop.service.YxStoreCouponUserService; -import co.yixiang.modules.shop.service.YxStoreProductReplyService; -import co.yixiang.modules.shop.service.YxStoreProductService; -import co.yixiang.modules.shop.service.YxSystemConfigService; +import co.yixiang.modules.shop.service.*; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; +import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.entity.YxWechatUser; @@ -148,6 +146,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl 0){ if(pinkService.pinkIngCount(order.getPinkId()) > 0){ statusDTO.set_class("state-nfh"); @@ -887,10 +886,17 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl list = new ArrayList<>(); list.add("收货地址填错了"); list.add("与描述不符"); - list.add("信了息填错，重新拍\\"); + list.add("信息填错了，重新拍"); list.add("收到商品损坏了"); list.add("未按预定时间发货"); list.add("其它原因"); @@ -659,6 +702,40 @@ public class StoreOrderController extends BaseController { return ApiResult.ok(expressInfo); } + /** + * 订单核销 + */ + @PostMapping("/order/order_verific") + @ApiOperation(value = "订单核销",notes = "订单核销") + public ApiResult orderVerify( @RequestBody OrderVerifyParam param){ + YxStoreOrder storeOrder = new YxStoreOrder(); + storeOrder.setVerifyCode(param.getVerifyCode()); + storeOrder.setIsDel(OrderInfoEnum.CANCEL_STATUS_0.getValue()); + storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue()); + storeOrder.setRefundStatus(OrderInfoEnum.REFUND_STATUS_0.getValue()); + + YxStoreOrder order = storeOrderService.getOne(Wrappers.query(storeOrder)); + if(order == null) return ApiResult.fail("核销的订单不存在或未支付或已退款"); + if(order.getStatus() > 0) return ApiResult.fail("订单已经核销"); + + if(order.getCombinationId() > 0 && order.getPinkId() > 0){ + YxStorePinkQueryVo storePink = storePinkService.getYxStorePinkById(order.getPinkId()); + if(!OrderInfoEnum.PINK_STATUS_2.getValue().equals(storePink.getStatus())){ + return ApiResult.fail("拼团订单暂未成功无法核销"); + } + } + + if(OrderInfoEnum.CONFIRM_STATUS_0.getValue().equals(param.getIsConfirm())){ + return ApiResult.ok(order); + } + + order.setStatus(OrderInfoEnum.STATUS_2.getValue()); + storeOrderService.updateById(order); + + return ApiResult.ok("核销成功"); + } + + } diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/ConfirmOrderDTO.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/ConfirmOrderDTO.java index 236ee6f8..2989fde8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/ConfirmOrderDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/dto/ConfirmOrderDTO.java @@ -2,6 +2,7 @@ package co.yixiang.modules.order.web.dto; import co.yixiang.modules.shop.entity.YxStoreCouponUser; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; +import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; import co.yixiang.modules.user.entity.YxUserAddress; import co.yixiang.modules.user.web.vo.YxUserQueryVo; import lombok.Data; @@ -46,7 +47,8 @@ public class ConfirmOrderDTO implements Serializable { private Integer storeSelfMention = 1; //店铺信息 - private List systemStore; + private YxSystemStoreQueryVo systemStore; + private YxStoreCouponUser usableCoupon; diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/param/OrderVerifyParam.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/OrderVerifyParam.java new file mode 100644 index 00000000..e80c17f5 --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/param/OrderVerifyParam.java @@ -0,0 +1,20 @@ +package co.yixiang.modules.order.web.param; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @ClassName OrderVerifyParam + * @Author hupeng <610796224@qq.com> + * @Date 2020/03/05 + **/ +@Data +public class OrderVerifyParam implements Serializable { + + private Integer isConfirm; + @NotBlank(message = "缺少核销码") + private String verifyCode; + +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java index 4185a1bf..13f7b8b5 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/web/vo/YxStoreOrderQueryVo.java @@ -2,6 +2,7 @@ package co.yixiang.modules.order.web.vo; import co.yixiang.modules.order.web.dto.StatusDTO; import co.yixiang.modules.shop.web.vo.YxStoreCartQueryVo; +import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -182,4 +183,10 @@ public class YxStoreOrderQueryVo implements Serializable { private Integer isSystemDel; + private String code; + + private String mapKey; + + private YxSystemStoreQueryVo systemStore; + } \ No newline at end of file diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStore.java b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStore.java new file mode 100644 index 00000000..3a1f819a --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/entity/YxSystemStore.java @@ -0,0 +1,81 @@ +package co.yixiang.modules.shop.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import co.yixiang.common.entity.BaseEntity; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + *

+ * 门店自提 + *

+ * + * @author hupeng + * @since 2020-03-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "YxSystemStore对象", description = "门店自提") +public class YxSystemStore extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "门店名称") + private String name; + + @ApiModelProperty(value = "简介") + private String introduction; + + @ApiModelProperty(value = "手机号码") + private String phone; + + @ApiModelProperty(value = "省市区") + private String address; + + @ApiModelProperty(value = "详细地址") + private String detailedAddress; + + @ApiModelProperty(value = "门店logo") + private String image; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "核销有效日期") + private String validTime; + + @ApiModelProperty(value = "每日营业开关时间") + private String dayTime; + + @ApiModelProperty(value = "添加时间") + private Integer addTime; + + @ApiModelProperty(value = "是否显示") + private Integer isShow; + + @ApiModelProperty(value = "是否删除") + private Integer isDel; + + private Date dayTimeEnd; + + private Date dayTimeStart; + + private Date validTimeEnd; + + private Date validTimeStart; + +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreMapper.java new file mode 100644 index 00000000..59e384b5 --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxSystemStoreMapper.java @@ -0,0 +1,40 @@ +package co.yixiang.modules.shop.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import co.yixiang.modules.shop.entity.YxSystemStore; +import co.yixiang.modules.shop.web.param.YxSystemStoreQueryParam; +import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.io.Serializable; + +/** + *

+ * 门店自提 Mapper 接口 + *

+ * + * @author hupeng + * @since 2020-03-04 + */ +@Repository +public interface YxSystemStoreMapper extends BaseMapper { + + /** + * 根据ID获取查询对象 + * @param id + * @return + */ + YxSystemStoreQueryVo getYxSystemStoreById(Serializable id); + + /** + * 获取分页对象 + * @param page + * @param yxSystemStoreQueryParam + * @return + */ + IPage getYxSystemStorePageList(@Param("page") Page page, @Param("param") YxSystemStoreQueryParam yxSystemStoreQueryParam); + +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/SystemStoreMap.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/SystemStoreMap.java new file mode 100644 index 00000000..91e0676c --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapping/SystemStoreMap.java @@ -0,0 +1,17 @@ +package co.yixiang.modules.shop.mapping; + +import co.yixiang.mapper.EntityMapper; +import co.yixiang.modules.shop.entity.YxSystemStore; +import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + + +/** +* @author hupeng +* @date 2020-03-04 +*/ +@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface SystemStoreMap extends EntityMapper { + +} \ No newline at end of file diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java new file mode 100644 index 00000000..35d3a749 --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java @@ -0,0 +1,37 @@ +package co.yixiang.modules.shop.service; + +import co.yixiang.modules.shop.entity.YxSystemStore; +import co.yixiang.common.service.BaseService; +import co.yixiang.modules.shop.web.param.YxSystemStoreQueryParam; +import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; +import co.yixiang.common.web.vo.Paging; + +import java.io.Serializable; + +/** + *

+ * 门店自提 服务类 + *

+ * + * @author hupeng + * @since 2020-03-04 + */ +public interface YxSystemStoreService extends BaseService { + + YxSystemStoreQueryVo getStoreInfo(); + + /** + * 根据ID获取查询对象 + * @param id + * @return + */ + YxSystemStoreQueryVo getYxSystemStoreById(Serializable id) throws Exception; + + /** + * 获取分页对象 + * @param yxSystemStoreQueryParam + * @return + */ + Paging getYxSystemStorePageList(YxSystemStoreQueryParam yxSystemStoreQueryParam) throws Exception; + +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index b418fc64..2cd3136e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -18,15 +18,13 @@ import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.mapper.YxStoreProductAttrValueMapper; import co.yixiang.modules.shop.mapper.YxStoreProductMapper; import co.yixiang.modules.shop.mapping.YxStoreProductMap; -import co.yixiang.modules.shop.service.YxStoreProductAttrService; -import co.yixiang.modules.shop.service.YxStoreProductRelationService; -import co.yixiang.modules.shop.service.YxStoreProductReplyService; -import co.yixiang.modules.shop.service.YxStoreProductService; +import co.yixiang.modules.shop.service.*; import co.yixiang.modules.shop.web.dto.ProductDTO; import co.yixiang.modules.shop.web.param.YxStoreProductQueryParam; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; import co.yixiang.modules.user.service.YxUserService; +import co.yixiang.utils.RedisUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -63,6 +61,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl + * 门店自提 服务实现类 + *

+ * + * @author hupeng + * @since 2020-03-04 + */ +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class YxSystemStoreServiceImpl extends BaseServiceImpl implements YxSystemStoreService { + + @Autowired + private YxSystemStoreMapper yxSystemStoreMapper; + + @Autowired + private SystemStoreMap storeMap; + + @Override + public YxSystemStoreQueryVo getStoreInfo() { + YxSystemStore systemStore = new YxSystemStore(); + systemStore.setIsDel(0); + YxSystemStore yxSystemStore = yxSystemStoreMapper.selectOne(Wrappers.query(systemStore)); + if(yxSystemStore == null) return null; + String mention = RedisUtil.get("store_self_mention"); + if(mention == null || Integer.valueOf(mention) == 2) return null; + return storeMap.toDto(yxSystemStore); + } + + @Override + public YxSystemStoreQueryVo getYxSystemStoreById(Serializable id) throws Exception{ + return yxSystemStoreMapper.getYxSystemStoreById(id); + } + + @Override + public Paging getYxSystemStorePageList(YxSystemStoreQueryParam yxSystemStoreQueryParam) throws Exception{ + Page page = setPageParam(yxSystemStoreQueryParam,OrderItem.desc("create_time")); + IPage iPage = yxSystemStoreMapper.getYxSystemStorePageList(page,yxSystemStoreQueryParam); + return new Paging(iPage); + } + +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/YxSystemStoreController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/YxSystemStoreController.java new file mode 100644 index 00000000..37a619f0 --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/YxSystemStoreController.java @@ -0,0 +1,91 @@ +package co.yixiang.modules.shop.web.controller; + +import co.yixiang.modules.shop.entity.YxSystemStore; +import co.yixiang.modules.shop.service.YxSystemStoreService; +import co.yixiang.modules.shop.web.param.YxSystemStoreQueryParam; +import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; +import co.yixiang.common.web.controller.BaseController; +import co.yixiang.common.api.ApiResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +import co.yixiang.common.web.vo.Paging; +import co.yixiang.common.web.param.IdParam; + +/** + *

+ * 门店自提 前端控制器 + *

+ * + * @author hupeng + * @since 2020-03-04 + */ +@Slf4j +@RestController +@RequestMapping("/yxSystemStore") +@Api("门店自提 API") +public class YxSystemStoreController extends BaseController { + + @Autowired + private YxSystemStoreService yxSystemStoreService; + + /** + * 添加门店自提 + */ + @PostMapping("/add") + @ApiOperation(value = "添加YxSystemStore对象",notes = "添加门店自提",response = ApiResult.class) + public ApiResult addYxSystemStore(@Valid @RequestBody YxSystemStore yxSystemStore) throws Exception{ + boolean flag = yxSystemStoreService.save(yxSystemStore); + return ApiResult.result(flag); + } + + /** + * 修改门店自提 + */ + @PostMapping("/update") + @ApiOperation(value = "修改YxSystemStore对象",notes = "修改门店自提",response = ApiResult.class) + public ApiResult updateYxSystemStore(@Valid @RequestBody YxSystemStore yxSystemStore) throws Exception{ + boolean flag = yxSystemStoreService.updateById(yxSystemStore); + return ApiResult.result(flag); + } + + /** + * 删除门店自提 + */ + @PostMapping("/delete") + @ApiOperation(value = "删除YxSystemStore对象",notes = "删除门店自提",response = ApiResult.class) + public ApiResult deleteYxSystemStore(@Valid @RequestBody IdParam idParam) throws Exception{ + boolean flag = yxSystemStoreService.removeById(idParam.getId()); + return ApiResult.result(flag); + } + + /** + * 获取门店自提 + */ + @PostMapping("/info") + @ApiOperation(value = "获取YxSystemStore对象详情",notes = "查看门店自提",response = YxSystemStoreQueryVo.class) + public ApiResult getYxSystemStore(@Valid @RequestBody IdParam idParam) throws Exception{ + YxSystemStoreQueryVo yxSystemStoreQueryVo = yxSystemStoreService.getYxSystemStoreById(idParam.getId()); + return ApiResult.ok(yxSystemStoreQueryVo); + } + + /** + * 门店自提分页列表 + */ + @PostMapping("/getPageList") + @ApiOperation(value = "获取YxSystemStore分页列表",notes = "门店自提分页列表",response = YxSystemStoreQueryVo.class) + public ApiResult> getYxSystemStorePageList(@Valid @RequestBody(required = false) YxSystemStoreQueryParam yxSystemStoreQueryParam) throws Exception{ + Paging paging = yxSystemStoreService.getYxSystemStorePageList(yxSystemStoreQueryParam); + return ApiResult.ok(paging); + } + +} + diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/dto/ProductDTO.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/dto/ProductDTO.java index 2ad83ab3..1e2671cd 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/dto/ProductDTO.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/dto/ProductDTO.java @@ -5,6 +5,7 @@ import co.yixiang.modules.shop.entity.YxStoreProductAttrValue; import co.yixiang.modules.shop.web.vo.YxStoreProductAttrQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductQueryVo; import co.yixiang.modules.shop.web.vo.YxStoreProductReplyQueryVo; +import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,8 +31,6 @@ public class ProductDTO extends QueryParam { //todo private List goodList = new ArrayList(); - //todo - private String mapKay = ""; //todo private Integer merId = 0; @@ -53,8 +52,10 @@ public class ProductDTO extends QueryParam { private YxStoreProductQueryVo storeInfo; - //todo - private Map system_store = new LinkedHashMap<>(); + private String mapKey; + + //门店 + private YxSystemStoreQueryVo systemStore; private Integer uid = 0; diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreQueryParam.java new file mode 100644 index 00000000..a952e16a --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxSystemStoreQueryParam.java @@ -0,0 +1,22 @@ +package co.yixiang.modules.shop.web.param; + +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import co.yixiang.common.web.param.QueryParam; + +/** + *

+ * 门店自提 查询参数对象 + *

+ * + * @author hupeng + * @date 2020-03-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value="YxSystemStoreQueryParam对象", description="门店自提查询参数") +public class YxSystemStoreQueryParam extends QueryParam { + private static final long serialVersionUID = 1L; +} diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreQueryVo.java new file mode 100644 index 00000000..6bc1646f --- /dev/null +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxSystemStoreQueryVo.java @@ -0,0 +1,73 @@ +package co.yixiang.modules.shop.web.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +import java.util.Date; + +/** + *

+ * 门店自提 查询结果对象 + *

+ * + * @author hupeng + * @date 2020-03-04 + */ +@Data +@ApiModel(value = "YxSystemStoreQueryVo对象", description = "门店自提查询参数") +public class YxSystemStoreQueryVo implements Serializable { + private static final long serialVersionUID = 1L; + + private Integer id; + + @ApiModelProperty(value = "门店名称") + private String name; + + @ApiModelProperty(value = "简介") + private String introduction; + + @ApiModelProperty(value = "手机号码") + private String phone; + + @ApiModelProperty(value = "省市区") + private String address; + + @ApiModelProperty(value = "详细地址") + private String detailedAddress; + + @ApiModelProperty(value = "门店logo") + private String image; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "核销有效日期") + private String validTime; + + private String latlng; + + public String getLatlng(){ + return latitude+","+longitude; + } + + @ApiModelProperty(value = "每日营业开关时间") + private String dayTime; + + @ApiModelProperty(value = "添加时间") + private Integer addTime; + + private Date dayTimeEnd; + + private Date dayTimeStart; + + private Date validTimeEnd; + + private Date validTimeStart; + +} \ No newline at end of file diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java index dcd158bc..08f72e8a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java @@ -9,12 +9,11 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.web.vo.Paging; -import co.yixiang.enums.AppFromEnum; -import co.yixiang.enums.BillEnum; -import co.yixiang.enums.OrderInfoEnum; -import co.yixiang.enums.PayTypeEnum; +import co.yixiang.enums.*; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.entity.YxUserRecharge; @@ -22,9 +21,12 @@ import co.yixiang.modules.user.mapper.YxUserMapper; import co.yixiang.modules.user.mapper.YxUserRechargeMapper; import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.YxUserRechargeService; +import co.yixiang.modules.user.service.YxWechatUserService; import co.yixiang.modules.user.web.param.RechargeParam; import co.yixiang.modules.user.web.param.YxUserRechargeQueryParam; import co.yixiang.modules.user.web.vo.YxUserRechargeQueryVo; +import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; +import co.yixiang.mp.service.YxTemplateService; import co.yixiang.utils.OrderUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -32,6 +34,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -56,6 +59,8 @@ public class YxUserRechargeServiceImpl extends BaseServiceImpl userInfo(){ int uid = SecurityUtils.getUserId().intValue(); - System.out.println("aa:"+uid); //update count yxUserService.setUserSpreadCount(uid); return ApiResult.ok(yxUserService.getYxUserById(uid)); diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java index 320a87ed..db3b6ee0 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java @@ -97,7 +97,7 @@ public class UserRechargeController extends BaseController { "公众号充值", price,BillDetailEnum.TYPE_1.getValue()); Map jsConfig = new HashMap<>(); jsConfig.put("appId",result.getAppId()); - jsConfig.put("timeStamp",result.getTimeStamp()); + jsConfig.put("timestamp",result.getTimeStamp()); jsConfig.put("nonceStr",result.getNonceStr()); jsConfig.put("package",result.getPackageValue()); jsConfig.put("signType",result.getSignType()); diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java index a76a5535..190e00f8 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java @@ -32,6 +32,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.common.bean.WxJsapiSignature; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; @@ -87,42 +88,25 @@ public class WechatController extends BaseController { @ApiOperation(value = "jssdk配置",notes = "jssdk配置") public ApiResult jsConfig(@RequestParam(value = "url") String url) throws WxErrorException { WxMpService wxService = WxMpConfiguration.getWxMpService(); - return ApiResult.ok(wxService.createJsapiSignature(url)); + WxJsapiSignature jsapiSignature = wxService.createJsapiSignature(url); + Map map = new LinkedHashMap<>(); + + map.put("appId",jsapiSignature.getAppId()); + map.put("jsApiList",new String[]{"updateAppMessageShareData","openLocation","scanQRCode","chooseWXPay"}); + map.put("nonceStr",jsapiSignature.getNonceStr()); + map.put("signature",jsapiSignature.getSignature()); + map.put("timestamp",jsapiSignature.getTimestamp()); + map.put("url",jsapiSignature.getUrl()); + return ApiResult.ok(map); } /** - * 微信支付回调 + * 微信支付/充值回调 */ @AnonymousAccess @PostMapping("/wechat/notify") - @ApiOperation(value = "微信支付回调",notes = "微信支付回调") - public String notify(@RequestBody String xmlData) { - try { - WxPayService wxPayService = WxPayConfiguration.getPayService(); - WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData); - String orderId = notifyResult.getOutTradeNo(); - YxStoreOrderQueryVo orderInfo = orderService.getOrderInfo(orderId,0); - if(orderInfo.getPaid() == 1){ - return WxPayNotifyResponse.success("处理成功!"); - } - - orderService.paySuccess(orderInfo.getOrderId(),"weixin"); - - return WxPayNotifyResponse.success("处理成功!"); - } catch (WxPayException e) { - log.error(e.getMessage()); - return WxPayNotifyResponse.fail(e.getMessage()); - } - - } - - /** - * 微信支付充值回调 - */ - @AnonymousAccess - @PostMapping("/wechat/renotify") @ApiOperation(value = "微信支付充值回调",notes = "微信支付充值回调") public String renotify(@RequestBody String xmlData) { try { diff --git a/yshop-api/src/main/resources/mapper/shop/YxSystemStoreMapper.xml b/yshop-api/src/main/resources/mapper/shop/YxSystemStoreMapper.xml new file mode 100644 index 00000000..5240497d --- /dev/null +++ b/yshop-api/src/main/resources/mapper/shop/YxSystemStoreMapper.xml @@ -0,0 +1,18 @@ + + + + + + + id, name, introduction, phone, address, detailed_address, image, latitude, longitude, valid_time, day_time, add_time, is_show, is_del, day_time_end, day_time_start, valid_time_end, valid_time_start + + + + + + + diff --git a/yshop-api/src/test/java/co/yixiang/test/CodeGenerator.java b/yshop-api/src/test/java/co/yixiang/test/CodeGenerator.java index 100f19ed..8cda22da 100644 --- a/yshop-api/src/test/java/co/yixiang/test/CodeGenerator.java +++ b/yshop-api/src/test/java/co/yixiang/test/CodeGenerator.java @@ -43,11 +43,11 @@ public class CodeGenerator { // ############################ 配置部分 start ############################ // 模块名称 - private static final String MODULE_NAME = "activity"; + private static final String MODULE_NAME = "shop"; // 作者 private static final String AUTHOR = "hupeng"; // 生成的表名称 - private static final String TABLE_NAME = "yx_store_bargain_user_help"; // 主键数据库列名称 + private static final String TABLE_NAME = "yx_system_store"; // 主键数据库列名称 private static final String PK_ID_COLUMN_NAME = "id"; // 代码生成策略 true：All/false:SIMPLE private static final boolean GENERATOR_STRATEGY = true; diff --git a/yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java b/yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java index 6fc53f66..137a0844 100644 --- a/yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java +++ b/yshop-common/src/main/java/co/yixiang/enums/OrderInfoEnum.java @@ -20,7 +20,7 @@ public enum OrderInfoEnum { PAY_STATUS_0(0,"未支付"), PAY_STATUS_1(1,"已支付"), - REFUND_STATUS_0(0,"未支付"), + REFUND_STATUS_0(0,"正常"), REFUND_STATUS_1(1,"退款中"), REFUND_STATUS_2(2,"已退款"), @@ -28,8 +28,19 @@ public enum OrderInfoEnum { BARGAIN_STATUS_2(2,"参与失败"), BARGAIN_STATUS_3(3,"参与成功"), + PINK_STATUS_1(1,"进行中"), + PINK_STATUS_2(2,"已完成"), + PINK_STATUS_3(3,"未完成"), + CANCEL_STATUS_0(0,"正常"), - CANCEL_STATUS_1(1,"已取消"); + CANCEL_STATUS_1(1,"已取消"), + + CONFIRM_STATUS_0(0,"正常"), + CONFIRM_STATUS_1(1,"确认"), + + + SHIPPIING_TYPE_1(1,"快递"), + SHIPPIING_TYPE_2(2,"门店自提"); diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/YxTemplateService.java b/yshop-mp/src/main/java/co/yixiang/mp/service/YxTemplateService.java index f7332c75..821b5f16 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/YxTemplateService.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/YxTemplateService.java @@ -18,12 +18,35 @@ public class YxTemplateService { private final String PAY_SUCCESS_KEY = "OPENTM207791277"; //pay private final String DELIVERY_SUCCESS_KEY = "OPENTM200565259"; //Delivery private final String REFUND_SUCCESS_KEY = "OPENTM410119152"; //Refund + private final String RECHARGE_SUCCESS_KEY = "OPENTM405847076"; //Recharge @Autowired private YxWechatTemplateService templateService; @Autowired private WxMpTemplateMessageService templateMessageService; + + /** + * 支付成功通知 + * @param time + * @param price + * @param openid + */ + public void rechargeSuccessNotice(String time,String price,String openid){ + String siteUrl = RedisUtil.get("site_url"); + YxWechatTemplate WechatTemplate = templateService.findByTempkey(RECHARGE_SUCCESS_KEY); + Map map = new HashMap<>(); + map.put("first","您的账户金币发生变动，详情如下："); + map.put("keyword1","充值"); + map.put("keyword2",time); + map.put("keyword3",price); + map.put("remark","yshop电商系统为你服务！"); + templateMessageService.sendWxMpTemplateMessage( openid + ,WechatTemplate.getTempid(), + siteUrl+"/user/account",map); + } + + /** * 支付成功通知 * @param orderId diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java index b5597eb2..dc03e3b5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java @@ -7,23 +7,24 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.aop.log.Log; import co.yixiang.constant.ShopConstants; +import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; +import co.yixiang.modules.activity.service.YxStorePinkService; +import co.yixiang.modules.activity.service.dto.YxStorePinkDTO; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; import co.yixiang.modules.shop.service.YxExpressService; import co.yixiang.modules.shop.service.YxStoreOrderService; import co.yixiang.modules.shop.service.YxStoreOrderStatusService; +import co.yixiang.modules.shop.service.YxWechatUserService; import co.yixiang.modules.shop.service.dto.YxExpressDTO; import co.yixiang.modules.shop.service.dto.YxStoreOrderDTO; import co.yixiang.modules.shop.service.dto.YxStoreOrderQueryCriteria; -import co.yixiang.modules.shop.service.YxWechatUserService; import co.yixiang.modules.shop.service.dto.YxWechatUserDTO; -import co.yixiang.mp.domain.YxWechatTemplate; import co.yixiang.mp.service.WxMpTemplateMessageService; import co.yixiang.mp.service.YxTemplateService; import co.yixiang.mp.service.YxWechatTemplateService; import co.yixiang.utils.OrderUtil; -import co.yixiang.utils.RedisUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -35,8 +36,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; -import java.util.Map; import java.util.concurrent.TimeUnit; /** @@ -54,24 +53,21 @@ public class StoreOrderController { private final YxStoreOrderStatusService yxStoreOrderStatusService; private final YxExpressService yxExpressService; private final YxWechatUserService wechatUserService; - private final WxMpTemplateMessageService templateMessageService; - private final YxWechatTemplateService yxWechatTemplateService; private final RedisTemplate redisTemplate; - private YxTemplateService templateService; + private final YxTemplateService templateService; + private final YxStorePinkService storePinkService; public StoreOrderController(YxStoreOrderService yxStoreOrderService, YxStoreOrderStatusService yxStoreOrderStatusService, - YxExpressService yxExpressService, YxWechatUserService wechatUserService, WxMpTemplateMessageService templateMessageService, - YxWechatTemplateService yxWechatTemplateService, + YxExpressService yxExpressService, YxWechatUserService wechatUserService, RedisTemplate redisTemplate, - YxTemplateService templateService) { + YxTemplateService templateService,YxStorePinkService storePinkService) { this.yxStoreOrderService = yxStoreOrderService; this.yxStoreOrderStatusService = yxStoreOrderStatusService; this.yxExpressService = yxExpressService; this.wechatUserService = wechatUserService; - this.templateMessageService = templateMessageService; - this.yxWechatTemplateService = yxWechatTemplateService; this.redisTemplate = redisTemplate; this.templateService = templateService; + this.storePinkService = storePinkService; } @GetMapping(value = "/data/count") @@ -96,6 +92,7 @@ public class StoreOrderController { @RequestParam(name = "orderType") String orderType) { + criteria.setShippingType(1);//默认查询所有快递订单 //订单状态查询 if (StrUtil.isNotEmpty(orderStatus)) { switch (orderStatus) { @@ -161,9 +158,13 @@ public class StoreOrderController { case "4": criteria.setNewBargainId(0); break; + case "5": + criteria.setShippingType(2); + break; } } + return new ResponseEntity(yxStoreOrderService.queryAll(criteria, pageable), HttpStatus.OK); } @@ -220,6 +221,34 @@ public class StoreOrderController { return new ResponseEntity(HttpStatus.NO_CONTENT); } + @ApiOperation(value = "订单核销") + @PutMapping(value = "/yxStoreOrder/check") + @PreAuthorize("@el.check('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") + public ResponseEntity check(@Validated @RequestBody YxStoreOrder resources) { + if (StrUtil.isBlank(resources.getVerifyCode())) throw new BadRequestException("核销码不能为空"); + YxStoreOrderDTO storeOrderDTO = yxStoreOrderService.findById(resources.getId()); + if(!resources.getVerifyCode().equals(storeOrderDTO.getVerifyCode())){ + throw new BadRequestException("核销码不对"); + } + if(OrderInfoEnum.PAY_STATUS_0.getValue().equals(storeOrderDTO.getPaid())){ + throw new BadRequestException("订单未支付"); + } + if(storeOrderDTO.getStatus() > 0) throw new BadRequestException("订单已核销"); + + if(storeOrderDTO.getCombinationId() > 0 && storeOrderDTO.getPinkId() > 0){ + YxStorePinkDTO storePinkDTO = storePinkService.findById(storeOrderDTO.getPinkId()); + if(!OrderInfoEnum.PINK_STATUS_2.getValue().equals(storePinkDTO.getStatus())){ + throw new BadRequestException("拼团订单暂未成功无法核销"); + } + } + + resources.setStatus(OrderInfoEnum.STATUS_2.getValue()); + yxStoreOrderService.update(resources); + + + return new ResponseEntity(HttpStatus.NO_CONTENT); + } + @ApiOperation(value = "退款") @PostMapping(value = "/yxStoreOrder/refund") diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java index 16188dfe..435c7096 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java @@ -74,7 +74,7 @@ public class SystemStoreController { @ApiOperation("设置门店信息") @PreAuthorize("@el.check('yxSystemStore:edit')") public ResponseEntity update(@Validated @RequestBody YxSystemStore resources){ - + //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); if(resources.getId() == null){ resources.setAddTime(OrderUtil.getSecondTimestampTwo()); yxSystemStoreService.create(resources); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java index 568da1de..1283431d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java @@ -1,6 +1,8 @@ package co.yixiang.modules.shop.rest; +import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; +import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxUserRecharge; import co.yixiang.modules.shop.service.YxUserRechargeService; import co.yixiang.modules.shop.service.dto.YxUserRechargeQueryCriteria; @@ -62,6 +64,7 @@ public class UserRechargeController { @PreAuthorize("@el.check('yxUserRecharge:del')") @DeleteMapping public ResponseEntity deleteAll(@RequestBody Integer[] ids) { + //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); yxUserRechargeService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java index b48c7fbd..b8314969 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java @@ -19,7 +19,7 @@ public interface YxStoreOrderService { Map chartCount(); - String orderType(int id, int pinkId, int combinationId, int seckillId,int bargainId); + String orderType(int id, int pinkId, int combinationId, int seckillId,int bargainId,int shippingType); void refund(YxStoreOrder resources); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java index 1df89d8b..bb34ea92 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java @@ -51,4 +51,7 @@ public class YxStoreOrderQueryCriteria{ @Query(propName="bargainId",type = Query.Type.NOT_EQUAL) private Integer newBargainId; + + @Query + private Integer shippingType; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index 5c30be75..e86d0563 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -3,6 +3,7 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.exception.EntityExistException; import co.yixiang.modules.activity.domain.YxStorePink; @@ -166,7 +167,8 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { } @Override - public String orderType(int id,int pinkId, int combinationId,int seckillId,int bargainId) { + public String orderType(int id,int pinkId, int combinationId,int seckillId, + int bargainId,int shippingType) { String str = "[普通订单]"; if(pinkId > 0 || combinationId > 0){ YxStorePink storePink = storePinkRepository.findByOrderIdKey(id); @@ -194,6 +196,7 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { }else if(bargainId > 0){ str = "[砍价订单]"; } + if(shippingType == 2) str = "[核销订单]"; return str; } @@ -234,7 +237,8 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { yxStoreOrderDTO.setPinkName(orderType(yxStoreOrder.getId() ,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId() - ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId())); + ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(), + yxStoreOrder.getShippingType())); List cartInfos = yxStoreOrderCartInfoRepository .findByOid(yxStoreOrder.getId());