订单状态

yiqi-admin/src/main/java/com/yiqi/admin/controller/app/AppUserController.java

@@ -218,6 +218,9 @@ public class AppUserController extends BaseController {
             queryWrapper.eq(AppUserBillMstr::getSourceType, SourceType.STORE.getCode());
             queryWrapper.eq(AppUserBillMstr::getOrgId, SecurityUtils.getLoginUser().getOrgId());
         }
+        if(StringUtils.isNotBlank(memberBillMstrQueryByMemberDTO.getRechargeCardSn())){
+            queryWrapper.eq(AppUserBillMstr::getRechargeCardNo, memberBillMstrQueryByMemberDTO.getRechargeCardSn());
+        }
         queryWrapper.orderByDesc(BaseEntity::getCreateTime);
         return R.ok(appUserBillMstrService.page(new Page<>(memberBillMstrQueryByMemberDTO.getPageNum()
                         , memberBillMstrQueryByMemberDTO.getPageSize())

yiqi-api/src/main/java/com/yiqi/api/controller/WeAppBannerController.java

@@ -32,8 +32,8 @@ public class WeAppBannerController {
 
     @ApiOperation("获取轮播图列表")
     @GetMapping(value = "list")
-    public R<List<AppBanner>> list() throws Exception{
-        return R.ok(appBannerService.list(new QueryWrapper<AppBanner>().lambda().eq(AppBanner::getStatus, StatusType.OK.getCode()).eq(AppBanner::getBannerType,AppBannerType.BANNER.getCode()).eq(AppBanner::getStatus,StatusType.OK.getCode())));
+    public R<List<AppBanner>> list(@RequestParam @ApiParam("0:轮播，3：金刚位 4：腰线") String bannerType) throws Exception{
+        return R.ok(appBannerService.list(new QueryWrapper<AppBanner>().lambda().eq(AppBanner::getStatus, StatusType.OK.getCode()).eq(AppBanner::getBannerType, bannerType).eq(AppBanner::getStatus,StatusType.OK.getCode())));
     }
 
     @ApiOperation("获取广告")

yiqi-api/src/main/java/com/yiqi/api/controller/order/WeAppOrderClothController.java

@@ -229,7 +229,7 @@ public class WeAppOrderClothController {
             queryWrapper.and(orderClothLambdaQueryWrapper -> orderClothLambdaQueryWrapper
                     .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.WAITING_FOR_PAY.getCode())
                     .or()
-                    .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.CONFIRM_PAY.getCode())
+                    .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.WAIT_FACTORY.getCode())
                     .or()
                     .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.WASHING.getCode()));
         }

yiqi-api/src/main/java/com/yiqi/api/controller/order/WeAppOrderClothDeliveryManController.java

@@ -16,18 +16,20 @@ import com.yiqi.common.enums.OrderRefundStatus;
 import com.yiqi.common.enums.SourceType;
 import com.yiqi.common.exception.ServiceException;
 import com.yiqi.common.utils.StringUtils;
-import com.yiqi.order.domain.OrderCloth;
-import com.yiqi.order.domain.OrderClothDeliveryAddress;
-import com.yiqi.order.domain.OrderClothStatusRecord;
+import com.yiqi.order.domain.*;
 import com.yiqi.order.domain.dto.weapp.AppOrderClothDeliveryChangeStatusDTO;
 import com.yiqi.order.domain.dto.weapp.AppOrderClothDeliveryManQueryDTO;
 import com.yiqi.order.domain.vo.OrderClothVO;
+import com.yiqi.order.domain.vo.OrderDeliveryVO;
 import com.yiqi.order.domain.vo.weapp.WeAppOrderClothAppointmentVO;
 import com.yiqi.order.service.IOrderClothDeliveryAddressService;
 import com.yiqi.order.service.IOrderClothService;
 import com.yiqi.order.service.IOrderClothStatusRecordService;
+import com.yiqi.order.service.IOrderDeliveryService;
 import com.yiqi.system.domain.SysOrg;
+import com.yiqi.system.domain.SysStore;
 import com.yiqi.system.service.ISysOrgService;
+import com.yiqi.system.service.ISysStoreService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -58,84 +60,48 @@ public class WeAppOrderClothDeliveryManController {
     @Autowired
     private ISysOrgService sysOrgService;
 
+    @Autowired
+    private ISysStoreService sysStoreService;
+
     @Autowired
     private IOrderClothService orderClothService;
 
+    @Autowired
+    private IOrderDeliveryService orderDeliveryService;
+
     @Autowired
     private IOrderClothStatusRecordService orderClothStatusRecordService;
 
     @ApiOperation("配送员查询订单列表")
     @PostMapping(value = "findDeliveryPage")
-    public R<List<OrderClothVO>> findDeliveryManPage(@RequestBody @Valid AppOrderClothDeliveryManQueryDTO appOrderClothDeliveryManQueryDTO) throws Exception{
-        Page<OrderCloth> page = new Page<>(appOrderClothDeliveryManQueryDTO.getPageNum()
+    public R<List<OrderDeliveryVO>> findDeliveryManPage(@RequestBody @Valid AppOrderClothDeliveryManQueryDTO appOrderClothDeliveryManQueryDTO) throws Exception{
+        Page<OrderDelivery> page = new Page<>(appOrderClothDeliveryManQueryDTO.getPageNum()
                 ,appOrderClothDeliveryManQueryDTO.getPageSize());
         page.setSearchCount(false);
 
-        LambdaQueryWrapper<OrderCloth> queryWrapper = new QueryWrapper<OrderCloth>().lambda()
-                .eq(OrderCloth::getRefundStatus,OrderRefundStatus.OK.getCode())
-                .and(orderClothLambdaQueryWrapper -> orderClothLambdaQueryWrapper
-                        .eq(OrderCloth::getSendClothAppUserId,AuthHolder.userId())
-                        .or()
-                        .eq(OrderCloth::getTakeClothAppUserId,AuthHolder.userId())
-                )
-//                .and(orderClothLambdaQueryWrapper -> orderClothLambdaQueryWrapper
-//                        .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.WAITING_TO_DOOR.getCode())
-//                        .or()
-//                        .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.HAS_TO_DOOR.getCode())
-//                        .or()
-//                        .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.WAITING_TO_SEND.getCode())
-//                        .or()
-//                        .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.SENDING.getCode())
-//                        .or()
-//                        .eq(OrderCloth::getOrderStatus,ClothOrderStatusType.FINISH.getCode()))
-                ;
-        if(StringUtils.isNotEmpty(appOrderClothDeliveryManQueryDTO.getOrderStatus())){
-            queryWrapper.eq(OrderCloth::getOrderStatus,appOrderClothDeliveryManQueryDTO.getOrderStatus());
-        }
+        LambdaQueryWrapper<OrderDelivery> queryWrapper = new LambdaQueryWrapper<OrderDelivery>();
+        queryWrapper.eq(OrderDelivery::getDeliveryManId,AuthHolder.userId());
+        queryWrapper.eq(OrderDelivery::getDeliveryStatus,appOrderClothDeliveryManQueryDTO.getDeliveryStatus());
         queryWrapper.orderByDesc(BaseEntity::getCreateTime);
-        List<OrderCloth> orderCloths = orderClothService.page(page
+        List<OrderDelivery> orderDeliveryList =  orderDeliveryService.page(page
                 ,queryWrapper).getRecords();
-        if(orderCloths.size() == 0){
+        if(orderDeliveryList.size() == 0){
             return R.ok(new ArrayList<>());
         }
-
-        List<OrderClothDeliveryAddress> list = orderClothDeliveryAddressService.list(new QueryWrapper<OrderClothDeliveryAddress>().lambda()
-                .in(OrderClothDeliveryAddress::getOrderId
-                        ,orderCloths.stream().map(OrderCloth::getId).collect(Collectors.toSet())));
-        Map<Long,OrderClothDeliveryAddress> collectAddressMap = list.stream().filter(orderClothDeliveryAddress -> ClothOrderDeliveryType.collectCloth.getCode()
-                .equals(orderClothDeliveryAddress.getClothOrderType()))
-                .collect(Collectors.toMap(OrderClothDeliveryAddress::getOrderId,OrderClothDeliveryAddress -> OrderClothDeliveryAddress));
-        Map<Long,OrderClothDeliveryAddress> takeAddressMap = list.stream().filter(orderClothDeliveryAddress -> ClothOrderDeliveryType.takeCloth.getCode()
-                .equals(orderClothDeliveryAddress.getClothOrderType()))
-                .collect(Collectors.toMap(OrderClothDeliveryAddress::getOrderId,OrderClothDeliveryAddress -> OrderClothDeliveryAddress));
-        Map<Long, SysOrg> storeOrgMap = new HashMap<>();
-        Map<Long,SysOrg> factoryOrgMap = new HashMap<>();
-        if(orderCloths.stream().filter(orderCloth -> SourceType.STORE.getCode().equals(orderCloth.getSourceType())).collect(Collectors.toList()).size() > 0){
-            storeOrgMap = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().in(SysOrg::getId
-                    ,orderCloths.stream().filter(orderCloth -> SourceType.STORE.getCode().equals(orderCloth.getSourceType())).map(OrderCloth::getOrgId).collect(Collectors.toSet()))
-                    .eq(SysOrg::getSourceType,SourceType.STORE.getCode())).stream().collect(Collectors.toMap(SysOrg::getId,SysOrg -> SysOrg));
-        }
-        if(orderCloths.stream().filter(orderCloth -> SourceType.FACTORY.getCode().equals(orderCloth.getSourceType())).collect(Collectors.toList()).size() > 0){
-            factoryOrgMap = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().in(SysOrg::getId
-                    ,orderCloths.stream().filter(orderCloth -> SourceType.FACTORY.getCode().equals(orderCloth.getSourceType())))
-                    .eq(SysOrg::getSourceType,SourceType.FACTORY.getCode())).stream().collect(Collectors.toMap(SysOrg::getId,SysOrg -> SysOrg));
-        }
-        List<OrderClothVO> orderClothVOS = new ArrayList<>();
-        for (OrderCloth orderCloth : orderCloths) {
-            OrderClothVO orderClothVO = new OrderClothVO();
-            BeanUtils.copyProperties(orderCloth,orderClothVO);
-            orderClothVO.setCollectClothDeliverInfo(collectAddressMap.get(orderCloth.getId()));
-            orderClothVO.setTakeClothDeliverInfo(takeAddressMap.get(orderCloth.getId()));
-            if(SourceType.FACTORY.getCode().equals(orderCloth.getSourceType())){
-                orderClothVO.setSysOrg(factoryOrgMap.get(orderCloth.getOrgId()));
-            }else if(SourceType.STORE.getCode().equals(orderCloth.getSourceType())){
-                orderClothVO.setSysOrg(storeOrgMap.get(orderCloth.getOrgId()));
-            }else{
-                orderClothVO.setSysOrg(SysOrg.buildManagerOrg());
+        List<OrderDeliveryVO> orderDeliveryVOList = new ArrayList<>();
+        for(OrderDelivery orderDelivery : orderDeliveryList){
+            OrderDeliveryVO orderDeliveryVO = new OrderDeliveryVO();
+            BeanUtils.copyProperties(orderDelivery,orderDeliveryVO);
+            //门店不为空
+            if(orderDelivery.getStoreId()!=null){
+                SysStore store = sysStoreService.getById(orderDelivery.getStoreId());
+                orderDeliveryVO.setStoreName(store.getName());
+                StoreAddressVO storeAddressVO = new StoreAddressVO();
+                BeanUtils.copyProperties(store,storeAddressVO);
             }
-            orderClothVOS.add(orderClothVO);
+            orderDeliveryVOList.add(orderDeliveryVO);
         }
-        return R.ok(orderClothVOS);
+        return R.ok(orderDeliveryVOList);
     }
 
     @Transactional(rollbackFor = Exception.class)

yiqi-common/src/main/java/com/yiqi/activity/domain/vo/ActivityClothItemVO.java

@@ -22,8 +22,12 @@ public class ActivityClothItemVO extends BaseEntity
 {
     private static final long serialVersionUID=1L;
 
+    @ApiModelProperty("ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
     /** 主键ID */
-    @ApiModelProperty("主键ID")
+    @ApiModelProperty("衣服ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long clothId;
 

yiqi-common/src/main/java/com/yiqi/app/domain/AppBanner.java

@@ -36,6 +36,10 @@ public class AppBanner extends BaseEntity
     @ApiModelProperty("图片类型")
     private String bannerType;
 
+    @Excel(name = "是否热销")
+    @ApiModelProperty("是否热销")
+    private String isHot;
+
     /** 图片地址 */
     @Excel(name = "图片地址")
     @ApiModelProperty("图片地址")

yiqi-common/src/main/java/com/yiqi/app/domain/dto/MemberBillMstrQueryByMemberDTO.java

@@ -14,4 +14,7 @@ public class MemberBillMstrQueryByMemberDTO extends PageVO {
     @NotNull(message = "客户id不能为空")
     private Long appUserId;
 
+    @ApiModelProperty("充值卡编号")
+    private String rechargeCardSn;
+
 }

yiqi-common/src/main/java/com/yiqi/common/enums/ClothOrderStatusType.java

@@ -8,7 +8,7 @@ public enum ClothOrderStatusType implements CodeEnum{
     , HAS_TO_DOOR("2","已上门")
     , HAS_TAKING("3", "已取货、待门店定价")
     , WAITING_FOR_PAY("4", "已定价、待支付")
-    , CONFIRM_PAY("5", "支付确认中")
+    , WAIT_FACTORY("5", "待入厂")
     , WASHING("6", "清洗中")
     , HAS_WASH("7", "洗衣完成、已到店")
     , WAITING_TO_SEND("8","待送衣")

yiqi-common/src/main/java/com/yiqi/order/domain/OrderDelivery.java

@@ -85,6 +85,14 @@ public class OrderDelivery extends BaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long appUserId;
 
+    /**
+     * 配送员
+     */
+    @Excel(name = "配送员")
+    @ApiModelProperty("配送员")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long deliveryManId;
+
     /**
      * 经纬度
      */

yiqi-common/src/main/java/com/yiqi/order/domain/StoreAddressVO.java

@@ -0,0 +1,40 @@
+package com.yiqi.order.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class StoreAddressVO implements Serializable {
+
+    /** 门店名称 */
+    @ApiModelProperty("门店名称")
+    private String name;
+
+    /** 负责人姓名 */
+    @ApiModelProperty("负责人姓名")
+    private String contactName;
+
+    /** 负责人手机 */
+    @ApiModelProperty("负责人手机")
+    private String contactPhone;
+
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String address;
+
+    /** 门牌号 */
+    @ApiModelProperty("门牌号")
+    private String addressDetail;
+
+    /** 纬度 */
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
+
+    /** 经度 */
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+
+}

yiqi-common/src/main/java/com/yiqi/order/domain/dto/weapp/AppOrderClothDeliveryManQueryDTO.java

@@ -11,6 +11,6 @@ import lombok.Data;
 @Data
 public class AppOrderClothDeliveryManQueryDTO extends PageVO {
 
-    @ApiModelProperty("订单状态（1=待上门,2=已上门,7=待配送,8=配送中,11=已完成）")
-    private String orderStatus;
+    @ApiModelProperty("配送状态（1=待上门,2=已上门,8=配送中,9=已完成, 100=已取消）")
+    private String deliveryStatus;
 }

yiqi-common/src/main/java/com/yiqi/order/domain/vo/OrderDeliveryVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiqi.common.annotation.Excel;
+import com.yiqi.order.domain.StoreAddressVO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -168,4 +169,10 @@ public class OrderDeliveryVO implements Serializable {
      */
     @Excel(name = "配送员电话")
     private String transporterPhone;
+
+    /**
+     * 商家地址
+     */
+    private StoreAddressVO storeAddress;
+
 }

yiqi-common/src/main/java/com/yiqi/recharge/domain/vo/weapp/WeAppCardsUseRecordsVO.java

@@ -22,6 +22,9 @@ public class WeAppCardsUseRecordsVO {
     @ApiModelProperty("充值门店名称")
     private String rechargeStoreName;
 
+    @ApiModelProperty("充值卡Sn")
+    private String rechargeCardSn;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("到期时间")
     private Date expireTime;

yiqi-core/src/main/java/com/yiqi/app/service/impl/AppBannerServiceImpl.java

@@ -50,7 +50,7 @@ public class AppBannerServiceImpl extends ServiceImpl<AppBannerMapper,AppBanner>
     @Override
     public int insertAppBanner(AppBanner appBanner) {
         appBanner.setCreateTime(DateUtils.getNowDate());
-        return baseMapper.insertAppBanner(appBanner);
+        return baseMapper.insert(appBanner);
     }
 
     /**
@@ -62,7 +62,7 @@ public class AppBannerServiceImpl extends ServiceImpl<AppBannerMapper,AppBanner>
     @Override
     public int updateAppBanner(AppBanner appBanner) {
         appBanner.setUpdateTime(DateUtils.getNowDate());
-        return baseMapper.updateAppBanner(appBanner);
+        return baseMapper.updateById(appBanner);
     }
 
     /**

yiqi-core/src/main/java/com/yiqi/recharge/service/impl/RechargePasswordCardServiceImpl.java

@@ -718,7 +718,7 @@ public class RechargePasswordCardServiceImpl extends ServiceImpl<RechargePasswor
         }
         WeAppCardsUseRecordsVO recordInfo = baseMapper.getUseRecordsByCardId(weAppCardRecordByCardDTO);
         recordInfo.setUserBillMstrList(appUserBillMstrService.list(new QueryWrapper<AppUserBillMstr>().lambda()
-                .eq(AppUserBillMstr::getRechargeCardId, weAppCardRecordByCardDTO.getRechargePasswordCardId())
+                .eq(AppUserBillMstr::getRechargeCardNo, weAppCardRecordByCardDTO.getRechargePasswordCardId())
                 .orderByDesc(AppUserBillMstr::getCreateTime)
                 .last("limit " + weAppCardRecordByCardDTO.getStartRow() + "," + weAppCardRecordByCardDTO.getPageSize())));
         return recordInfo;

yiqi-core/src/main/resources/mapper/activity/ActivityClothItemMapper.xml

@@ -25,7 +25,7 @@
     </sql>
 
     <select id="selectActivityClothItemList" parameterType="ActivityClothItem" resultType="com.yiqi.activity.domain.vo.ActivityClothItemVO">
-        select c.id as clothId, ac.cloth_item_id, ac.discount, c.name as cloth_item_name, ac.price, ac.wash_mode_ids,
+        select ac.id, c.id as clothId, ac.cloth_item_id, ac.discount, c.name as cloth_item_name, ac.price, ac.wash_mode_ids,
         ac.create_by_id, ac.create_by, ac.create_time
         , ac.update_by_id, ac.update_by, ac.update_time, ac.remark
         from activity_cloth_item as ac

yiqi-core/src/main/resources/mapper/app/AppBannerMapper.xml

@@ -22,13 +22,11 @@
     </resultMap>
 
     <sql id="selectAppBannerVo">
-        select id, banner_type, img_url, click_type, redirect_title, redirect_content, status, create_by_id, create_by, create_time, update_by_id, update_by, update_time, remark
-        from app_banner
+        select * from app_banner
     </sql>
 
     <select id="selectAppBannerList" parameterType="AppBanner" resultMap="AppBannerResult">
-        select id, banner_type, img_url, click_type, redirect_title, status, create_by_id, create_by, create_time, update_by_id, update_by, update_time, remark
-        from app_banner
+        select * from app_banner
         <where>
             <if test="bannerType != null  and bannerType != ''">
                 and banner_type = #{bannerType}