今日订单 筛选调整

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreSalesDetailsVo.java

@@ -55,6 +55,9 @@ public class StoreSalesDetailsVo {
     @ApiModelProperty(value = "1-代金券  2-套餐")
     private Integer type;
 
+    @ApiModelProperty(value = "代金券套餐类型 (查询用)")
+    private List<String> typeList;
+
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "支付时间-开始时间")
     private Date payStartTime;
@@ -62,4 +65,10 @@ public class StoreSalesDetailsVo {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "支付时间-结束时间")
     private Date payEndTime;
+
+    @ApiModelProperty(value = "预计收入")
+    private String expecteDrevenue;
+
+    @ApiModelProperty(value = "实付款")
+    private String finalPrice;
 }

alien-entity/src/main/java/shop/alien/mapper/StoreSalesDetailsMapper.java

@@ -18,7 +18,8 @@ import shop.alien.entity.store.vo.StoreSalesDetailsVo;
 @Mapper
 public interface StoreSalesDetailsMapper extends BaseMapper<LifeUserOrder> {
 
-    @Select("select coupon.name couponName, luser.user_phone userPhone, lorder.order_no orderNo, lorder.pay_time payTime, lorder.price, lorder.status " +
+    @Select("select coupon.name couponName, luser.user_phone userPhone, lorder.order_no orderNo, lorder.pay_time payTime, lorder.price, " +
+            "lorder.final_price finalPrice, (lorder.final_price*0.97)  expecteDrevenue, lorder.status " +
             "from life_user_order lorder " +
             "join life_coupon coupon on coupon.id = lorder.quan_id " +
             "join life_user luser on luser.id = lorder.user_id ${ew.customSqlSegment}")

alien-store/src/main/java/shop/alien/store/controller/StoreUserController.java

@@ -106,9 +106,9 @@ public class StoreUserController {
         boolean flag = false;
         flag = storeUserService.forgetOrModifyPassword(phone, newPhone, oldPassword, newPassword, confirmNewPassword, verificationCode, type);
         if(flag){
-            return R.success("密码修改成功");
+            return R.success("修改成功");
         }else {
-            return R.success("密码修改失败");
+            return R.success("修改失败");
         }
     }
 

alien-store/src/main/java/shop/alien/store/job/StoreMembershipCardJob.java

@@ -130,10 +130,10 @@ public class StoreMembershipCardJob {
             if (null != storeUser.getLogoutTime()) {
                 // 获取申请注销时间
                 Date logoutTime = storeUser.getLogoutTime();
-                // 获取申请注销 7 天后的时间
+                // 获取申请注销 8 天后的时间
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(logoutTime);
-                calendar.add(Calendar.DAY_OF_YEAR, 7);
+                calendar.add(Calendar.DAY_OF_YEAR, 8);
                 Date sevenDay = calendar.getTime();
                 // 获取当前时间
                 Date date = new Date();
@@ -151,10 +151,10 @@ public class StoreMembershipCardJob {
             if (null != storeInfo.getLogoutTime()) {
                 // 获取申请注销时间
                 Date logoutTime = storeInfo.getLogoutTime();
-                // 获取申请注销 7 天后的时间
+                // 获取申请注销 8 天后的时间
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(logoutTime);
-                calendar.add(Calendar.DAY_OF_YEAR, 7);
+                calendar.add(Calendar.DAY_OF_YEAR, 8);
                 Date sevenDay = calendar.getTime();
                 // 获取当前时间
                 Date date = new Date();

alien-store/src/main/java/shop/alien/store/service/impl/StoreSalesDetailsServiceImpl.java

@@ -28,9 +28,11 @@ public class StoreSalesDetailsServiceImpl implements StoreSalesDetailsService {
         wrapper.eq("coupon.delete_flag", 0);
         wrapper.eq("luser.delete_flag", 0);
         wrapper.eq(null != storeSalesDetailsVo.getStoreId(), "lorder.store_id", storeSalesDetailsVo.getStoreId());
-        wrapper.eq(null != storeSalesDetailsVo.getType(), "coupon.type", storeSalesDetailsVo.getType());
+        wrapper.in(CollectionUtils.isNotEmpty(storeSalesDetailsVo.getTypeList()), "coupon.type", storeSalesDetailsVo.getTypeList());
         wrapper.ge(null != storeSalesDetailsVo.getPayStartTime(), "lorder.pay_time", storeSalesDetailsVo.getPayStartTime());
         if (null != storeSalesDetailsVo.getPayEndTime()) {
+            wrapper.ge(null != storeSalesDetailsVo.getPayEndTime(), "lorder.pay_time", storeSalesDetailsVo.getPayEndTime());
+        }else{
             wrapper.le("lorder.pay_time", Date.from(storeSalesDetailsVo.getPayEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusHours(23).plusMinutes(59).plusSeconds(59).atZone(ZoneId.systemDefault()).toInstant()));
         }
         wrapper.eq(StringUtils.isNotEmpty(storeSalesDetailsVo.getStatus()), "lorder.status", storeSalesDetailsVo.getStatus());

alien-store/src/main/java/shop/alien/store/service/impl/StoreUserServiceImpl.java

@@ -534,13 +534,14 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         StoreUser storeUser = storeUserMapper.selectOne(storeUserLambdaQueryWrapper);
         Map<String, String> storeMap = new HashMap<>();
         if (storeUser != null) {
+            storeMap.put("status",storeUser.getStatus().toString());
             if (null != storeUser.getStoreId()) {
                 StoreInfo storeInfo = storeInfoMapper.selectById(storeUser.getStoreId());
                 if (1 != storeInfo.getLogoutFlag()) {
                     //vaule为0代表有商铺未注销
                     storeMap.put("accountStore", "0");
                 } else {
-                    //vaule为1代表可注销
+                    //vaule为1代表绑定店铺注销
                     storeMap.put("accountStore", "1");
                 }
             } else if (storeUser.getMoney() != null && storeUser.getMoney() > 0) {
@@ -614,6 +615,8 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
                 storeUser.setStatus(-1);
                 // 添加注销申请时间
                 storeUser.setLogoutTime(new Date());
+                // 更新logout_flag状态为1
+                storeUser.setLogoutFlag(1);
                 int num = storeUserMapper.updateById(storeUser);
                 if (num > 0) {
                     // 发送通知
@@ -645,6 +648,8 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         storeUser.setLogoutReason(null);
         // 清空注销申请时间
         storeUser.setLogoutTime(null);
+        // 更新logout_flag状态为0
+        storeUser.setLogoutFlag(0);
         int num = storeUserMapper.updateById(storeUser);
             if (num > 0) {
                 // 发送通知