签到

mall-service/src/main/java/com/txz/mall/controller/OrderInfoController.java

@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * Created by CodeGenerator on 2025/07/22.
  */
-@Api(tags = "[后台]storeOrderInfo管理")
+@Api(tags = "[后台]订单内容管理")
 @RestController
 @RequestMapping("/store/order/info")
 public class OrderInfoController {
@@ -32,7 +32,7 @@ public class OrderInfoController {
     private StoreOrderInfoService storeOrderInfoService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "storeOrderInfo新增")
+    @ApiOperation(value = "订单内容新增")
     public Result add(@RequestBody StoreOrderInfo storeOrderInfo) {
         if (storeOrderInfo == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
@@ -49,7 +49,7 @@ public class OrderInfoController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "storeOrderInfo删除")
+    @ApiOperation(value = "订单内容删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
@@ -67,7 +67,7 @@ public class OrderInfoController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "storeOrderInfo更新")
+    @ApiOperation(value = "订单内容更新")
     public Result update(@RequestBody StoreOrderInfo storeOrderInfo) {
         if (storeOrderInfo == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
@@ -87,7 +87,7 @@ public class OrderInfoController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "storeOrderInfo获取详情")
+    @ApiOperation(value = "订单内容获取详情")
     public Result<StoreOrderInfo> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
@@ -103,7 +103,7 @@ public class OrderInfoController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "storeOrderInfo获取列表")
+    @ApiOperation(value = "订单内容获取列表")
     public Result<List<StoreOrderInfo>> list(@RequestBody StoreOrderInfo storeOrderInfo, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
         PageHelper.startPage(page, size);
 

mall-service/src/main/java/com/txz/mall/controller/OrderStatusController.java

@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * Created by CodeGenerator on 2025/07/25.
  */
-@Api(tags = "[后台]storeOrderStatus管理")
+@Api(tags = "[后台]订单状态管理")
 @RestController
 @RequestMapping("/store/order/status")
 public class OrderStatusController {
@@ -32,7 +32,7 @@ public class OrderStatusController {
     private StoreOrderStatusService storeOrderStatusService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "storeOrderStatus新增")
+    @ApiOperation(value = "订单状态新增")
     public Result add(@RequestBody StoreOrderStatus storeOrderStatus) {
         if (storeOrderStatus == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
@@ -49,7 +49,7 @@ public class OrderStatusController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "storeOrderStatus删除")
+    @ApiOperation(value = "订单状态删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
@@ -66,7 +66,7 @@ public class OrderStatusController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "storeOrderStatus更新")
+    @ApiOperation(value = "订单状态更新")
     public Result update(@RequestBody StoreOrderStatus storeOrderStatus) {
         if (storeOrderStatus == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
@@ -85,7 +85,7 @@ public class OrderStatusController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "storeOrderStatus获取详情")
+    @ApiOperation(value = "订单状态获取详情")
     public Result<StoreOrderStatus> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
@@ -101,7 +101,7 @@ public class OrderStatusController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "storeOrderStatus获取列表")
+    @ApiOperation(value = "订单状态获取列表")
     public Result<List<StoreOrderStatus>> list(@RequestBody StoreOrderStatus storeOrderStatus, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
         PageHelper.startPage(page, size);
 

mall-service/src/main/java/com/txz/mall/controller/UserSignController.java

@@ -9,9 +9,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import vo.UserSignDetailVO;
 
 import javax.annotation.Resource;
-import java.util.Map;
+import java.util.List;
 
 /**
  * Created by CodeGenerator on 2025/07/11.
@@ -35,7 +36,7 @@ public class UserSignController {
 
     @ApiOperation(value = "今日记录详情")
     @PostMapping(value = "/todayDetail")
-    public Result<Map<String, Object>> todayDetail() {
+    public Result<List<UserSignDetailVO>> todayDetail() {
         return Result.success(userSignService.todayDetail());
     }
 

mall-service/src/main/java/com/txz/mall/dubbo/client/OperatingConfigDubboServiceClient.java

@@ -1,5 +1,6 @@
 package com.txz.mall.dubbo.client;
 
+import com.txz.mall.core.ServiceException;
 import com.txz.operating.dto.ConfigDTO;
 import com.txz.operating.result.Result;
 import com.txz.operating.service.OperatingConfigDubboService;
@@ -20,7 +21,12 @@ public class OperatingConfigDubboServiceClient {
      * @param code
      * @return
      */
-    public Result<ConfigDTO> getConfigByCode(String code) {
-        return operatingConfigDubboService.getConfigByCode(code);
+    public ConfigDTO getConfigByCode(String code) {
+        Result<ConfigDTO> configByCode = operatingConfigDubboService.getConfigByCode(code);
+        if (configByCode.getCode().equals("200") && configByCode.getData() != null) {
+            return configByCode.getData();
+        } else {
+            throw new ServiceException("获取配置失败");
+        }
     }
 }

mall-service/src/main/java/com/txz/mall/model/UserAddress.java

@@ -65,6 +65,12 @@ public class UserAddress {
     @ApiModelProperty(value = "收货人详细地址")
     private String detail;
 
+    /**
+     * 邮编
+     */
+    @ApiModelProperty(value = "邮编")
+    private String postCode;
+
     /**
      * 经度
      */

mall-service/src/main/java/com/txz/mall/service/UserSignService.java

@@ -2,8 +2,9 @@ package com.txz.mall.service;
 
 import com.txz.mall.core.Service;
 import com.txz.mall.model.UserSign;
+import vo.UserSignDetailVO;
 
-import java.util.HashMap;
+import java.util.List;
 
 
 /**
@@ -16,7 +17,7 @@ public interface UserSignService extends Service<UserSign> {
      *
      * @return HashMap
      */
-    HashMap<String, Object> todayDetail();
+    List<UserSignDetailVO> todayDetail();
 
     /**
      * 签到

mall-service/src/main/java/com/txz/mall/service/impl/UserSignServiceImpl.java

@@ -11,18 +11,20 @@ import com.txz.mall.model.SystemGroupData;
 import com.txz.mall.model.UserSign;
 import com.txz.mall.service.SystemGroupDataService;
 import com.txz.mall.service.UserSignService;
+import com.txz.operating.dto.ConfigDTO;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example;
-import vo.GroupDataFormCheckVO;
-import vo.GroupDataFormItemCheckVO;
+import vo.UserSignDetailVO;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -32,7 +34,10 @@ import java.util.stream.Collectors;
 @Service
 @Transactional
 public class UserSignServiceImpl extends AbstractService<UserSign> implements UserSignService {
+
     private static final long USER_ID = 1;
+    private static final String SIGN_CODE = "user_code";
+
     @Resource
     private UserSignMapper userSignMapper;
     @Resource
@@ -41,31 +46,9 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
     private OperatingConfigDubboServiceClient configDubboServiceClient;
 
     @Override
-    public HashMap<String, Object> todayDetail() {
-        HashMap<String, Object> map = new HashMap<>();
-
-        boolean hasSignedToday = hasSignedToday(USER_ID);
-        map.put("today", hasSignedToday);
-
-        // 3. 查询用户的连续签到天数
-        int continuousDays = getContinuousDays(USER_ID);
-        map.put("continuous", continuousDays);
-
-        ArrayList<GroupDataFormItemCheckVO> list = new ArrayList<>();
-        List<SystemGroupData> systemGroupData = groupData();
-        for (SystemGroupData groupData : systemGroupData) {
-            if (StringUtils.isNotBlank(groupData.getValue())) {
-                List<GroupDataFormItemCheckVO> fields = JSONObject.parseObject(groupData.getValue(), GroupDataFormCheckVO.class).getFields();
-                GroupDataFormItemCheckVO vo = new GroupDataFormItemCheckVO();
-                List<String> dayCollect = fields.stream().filter(field -> field.getName().equals(Constants.SIGN_TYPE_DAY_TITLE)).map(GroupDataFormItemCheckVO::getValue).collect(Collectors.toList());
-                Integer gold = fields.stream().filter(field -> field.getName().equals(Constants.SIGN_TYPE_GOLD_TITLE)).map(GroupDataFormItemCheckVO::getValue).map(Integer::valueOf).reduce(0, Integer::sum);
-                vo.setName(dayCollect.get(0));
-                vo.setValue(gold.toString());
-                list.add(vo);
-            }
-        }
-        map.put("fields", list);
-        return map;
+    public List<UserSignDetailVO> todayDetail() {
+        ConfigDTO configByCode = configDubboServiceClient.getConfigByCode(SIGN_CODE);
+        return JSONObject.parseArray(configByCode.getValueInfo(), UserSignDetailVO.class);
     }
 
     @Override
@@ -106,9 +89,8 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
     private boolean hasSignedToday(Long USER_ID) {
         Condition condition = new Condition(UserSign.class);
         Example.Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("isDelete", 0);
         criteria.andEqualTo("uid", USER_ID);
-        criteria.andLike("signDate", new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + "%");
+        criteria.andLike("createDay", new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + "%");
         return !userSignMapper.selectByCondition(condition).isEmpty();
     }
 
@@ -117,9 +99,8 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
         Date yesterday = DateUtils.addDays(new Date(), -1);
         Condition condition = new Condition(UserSign.class);
         Example.Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("isDelete", 0);
         criteria.andEqualTo("uid", USER_ID);
-        criteria.andLike("signDate", new SimpleDateFormat("yyyy-MM-dd").format(yesterday) + "%");
+        criteria.andLike("createDay", new SimpleDateFormat("yyyy-MM-dd").format(yesterday) + "%");
         List<UserSign> list = userSignMapper.selectByCondition(condition);
         return list.isEmpty() ? null : list.get(0);
     }
@@ -140,7 +121,6 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
         // 获取最新的签到记录
         Condition condition = new Condition(UserSign.class);
         Example.Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("isDelete", 0);
         criteria.andEqualTo("uid", userId);
         condition.orderBy("id").desc();
         List<UserSign> list = userSignMapper.selectByCondition(condition);
@@ -156,18 +136,21 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
     // 根据连续签到天数发放奖励
     private void giveReward(int continuousDays) {
         int reward = 0;
-        List<SystemGroupData> systemGroupData = groupData();
-        for (SystemGroupData groupData : systemGroupData) {
-            if (StringUtils.isNotBlank(groupData.getValue())) {
-                List<GroupDataFormItemCheckVO> fields = com.alibaba.fastjson.JSONObject.parseObject(groupData.getValue(), GroupDataFormCheckVO.class).getFields();
-                reward += fields.stream().filter(field -> field.getName().equals(Constants.SIGN_TYPE_GOLD_TITLE)).map(GroupDataFormItemCheckVO::getValue).map(Integer::valueOf).reduce(0, Integer::sum);
-            }
-        }
+//        List<SystemGroupData> systemGroupData = groupData();
+//        for (SystemGroupData groupData : systemGroupData) {
+//            if (StringUtils.isNotBlank(groupData.getValue())) {
+//                List<GroupDataFormItemCheckVO> fields = com.alibaba.fastjson.JSONObject.parseObject(groupData.getValue(), GroupDataFormCheckVO.class).getFields();
+//                reward += fields.stream().filter(field -> field.getName().equals(Constants.SIGN_TYPE_GOLD_TITLE)).map(GroupDataFormItemCheckVO::getValue).map(Integer::valueOf).reduce(0, Integer::sum);
+//            }
+//        }
 
         // todo 发到个人用户
     }
 
     private List<SystemGroupData> groupData() {
+        ConfigDTO configByCode = configDubboServiceClient.getConfigByCode(SIGN_CODE);
+
+
         List<SystemGroupData> systemGroupData = systemGroupDataService.configDetail(Constants.GROUP_DATA_ID_SIGN.longValue(), Constants.GROUP_DATA_STATUS_NORMAL);
         if (CollectionUtils.isEmpty(systemGroupData)) {
             throw new ServiceException("系统配置异常");

mall-service/src/main/java/vo/UserSignDetailVO.java

@@ -0,0 +1,29 @@
+package vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class UserSignDetailVO implements Serializable {
+
+    private static final long serialVersionUID = 9215241889318610262L;
+
+    @ApiModelProperty(value = "天数")
+    private String days;
+
+    @ApiModelProperty(value = "签到类型  1-金币  2-积分  3-经验")
+    private String type;
+
+    @ApiModelProperty(value = "值")
+    private String value;
+
+    @ApiModelProperty(value = "状态 0-未签到  1-已签到")
+    private String status;
+}

mall-service/src/main/resources/mapper/UserAddressMapper.xml

@@ -14,6 +14,7 @@
         <result column="district" jdbcType="VARCHAR" property="district"/>
         <result column="street" jdbcType="VARCHAR" property="street"/>
         <result column="detail" jdbcType="VARCHAR" property="detail"/>
+        <result column="post_code" jdbcType="VARCHAR" property="postCode"/>
         <result column="longitude" jdbcType="VARCHAR" property="longitude"/>
         <result column="latitude" jdbcType="VARCHAR" property="latitude"/>
         <result column="is_default" jdbcType="INTEGER" property="isDefault"/>