后台拼单列表

mall-service/src/main/java/com/txz/mall/business/impl/PinkServiceBusinessImpl.java

@@ -42,7 +42,7 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         criteria.andEqualTo("id", pinkId);
-        criteria.andEqualTo("kId", pinkId);
+//        criteria.andEqualTo("kId", pinkId);
         List<StorePink> pinkList = storePinkService.findByCondition(condition);
         pinkList = pinkList.stream()
                 .sorted(Comparator.comparing(StorePink::getId).reversed())
@@ -51,7 +51,7 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
         return pinkList.stream().map(pink -> {
             StorePinkDetailVO response = new StorePinkDetailVO();
             BeanUtils.copyProperties(pink, response);
-            Condition orderCondition = new Condition(StorePink.class);
+            Condition orderCondition = new Condition(StoreOrder.class);
             Example.Criteria orderCriteria = condition.createCriteria();
             orderCriteria.andEqualTo("isDelete", 0);
             orderCriteria.andEqualTo("id", pinkId);
@@ -60,6 +60,8 @@ public class PinkServiceBusinessImpl implements PinkServiceBusiness {
             if (ObjectUtil.isNotNull(storeOrder)) {
                 response.setOrderStatus(storeOrder.getStatus());
                 response.setRefundStatus(storeOrder.getRefundStatus());
+                response.setUserPhone(storeOrder.getUserPhone());
+                response.setPayTime(storeOrder.getPayTime());
             }
             return response;
         }).collect(Collectors.toList());

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

@@ -116,6 +116,8 @@ public class PinkController {
         Condition condition = new Condition(storePink.getClass());
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
+        criteria.andEqualTo("orderId", storePink.getOrderId());
+        criteria.andEqualTo("id", storePink.getId());
         condition.setOrderByClause("create_time DESC");
         if (storePink.getPid() != null) {
             criteria.andEqualTo("pid", storePink.getPid());

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

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

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

@@ -1,10 +1,12 @@
 package com.txz.mall.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.txz.mall.constants.Constants;
 import com.txz.mall.core.AbstractService;
 import com.txz.mall.core.ServiceException;
 import com.txz.mall.dao.UserSignMapper;
+import com.txz.mall.dubbo.client.OperatingConfigDubboServiceClient;
 import com.txz.mall.model.SystemGroupData;
 import com.txz.mall.model.UserSign;
 import com.txz.mall.service.SystemGroupDataService;
@@ -35,6 +37,8 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
     private UserSignMapper userSignMapper;
     @Resource
     private SystemGroupDataService systemGroupDataService;
+    @Resource
+    private OperatingConfigDubboServiceClient configDubboServiceClient;
 
     @Override
     public HashMap<String, Object> todayDetail() {
@@ -51,7 +55,7 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
         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();
+                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);
@@ -95,7 +99,7 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
         userSign.setUid(USER_ID);
         userSign.setCreateDay(new Date());
         userSign.setContinuousDays(continuousDays);
-        userSignMapper.insert(userSign);
+        save(userSign);
     }
 
     // 判断今天是否已经签到

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

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -23,9 +24,12 @@ public class StorePinkDetailVO implements Serializable {
     @ApiModelProperty(value = "用户id")
     private Integer uid;
 
-    @ApiModelProperty(value = "订单id 生成")
+    @ApiModelProperty(value = "订单编号")
     private String orderId;
 
+    @ApiModelProperty(value = "订单id  数据库")
+    private Long orderIdKey;
+
     @ApiModelProperty(value = "购买总金额")
     private BigDecimal totalPrice;
 
@@ -35,10 +39,19 @@ public class StorePinkDetailVO implements Serializable {
     @ApiModelProperty(value = "用户头像")
     private String avatar;
 
+    @ApiModelProperty(value = "用户电话")
+    private String userPhone;
+
     @ApiModelProperty(value = "订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）")
     private Integer orderStatus;
 
     @ApiModelProperty(value = "0 未退款 1 申请中 2 已退款 3退款中")
     private Integer refundStatus;
 
+    @ApiModelProperty(value = "支付时间")
+    private Date payTime;
+
+    @ApiModelProperty(value = "奖励佣金")
+    private BigDecimal commission;
+
 }