二手委托人信息管理模块

alien-entity/src/main/java/shop/alien/entity/second/SecondEntrustUser.java

@@ -57,7 +57,6 @@ public class SecondEntrustUser extends Model<SecondEntrustUser> {
 
     @ApiModelProperty(value = "删除标记, 0:未删除, 1:已删除")
     @TableField("delete_flag")
-    @TableLogic
     private Integer deleteFlag;
 
     @ApiModelProperty(value = "创建时间")

alien-entity/src/main/java/shop/alien/entity/second/vo/SecondTradeRecordVo.java

@@ -77,15 +77,15 @@ public class SecondTradeRecordVo extends SecondTradeRecord {
     @ApiModelProperty(value = "商品信息")
     private SecondGoodsVo goodsInfo;
 
-//    @ApiModelProperty(value = "商品信息")
-//    private Integer entrustId;
-//
-//    @ApiModelProperty(value = "商品信息")
-//    private String userPhone;
-//
-//    @ApiModelProperty(value = "商品信息")
-//    private String userName;
-//
-//    @ApiModelProperty(value = "商品信息")
-//    private String idCard;
+    @ApiModelProperty(value = "委托人ID")
+    private Integer entrustId;
+
+    @ApiModelProperty(value = "委托人电话")
+    private String entrustUserPhone;
+
+    @ApiModelProperty(value = "委托人姓名")
+    private String entrustUserName;
+
+    @ApiModelProperty(value = "委托人身份证")
+    private String entrustIdCard;
 }

alien-second/src/main/java/shop/alien/second/controller/SecondTradeRecordController.java

@@ -162,9 +162,9 @@ public class SecondTradeRecordController {
                                         String transactionLatitudeLongitude,
                                         String transactionLatitudeLongitudeAddress,
                                         String transactionLocation,
-                                        String messageId, String userPhone, String userName, String idCard, Integer entrustId) throws Exception {
+                                        String messageId, String entrustUserPhone, String entrustUserName, String entrustIdCard, Integer entrustId) throws Exception {
         log.info("SecondTradeRecordController.modifyTradeRecord?record={}", transactionTime);
-        return R.data(secondTradeRecordService.modifyTradeRecord(type, tradeId, transactionTime, transactionLatitudeLongitude, transactionLatitudeLongitudeAddress, transactionLocation, messageId, userPhone, userName, idCard, entrustId));
+        return R.data(secondTradeRecordService.modifyTradeRecord(type, tradeId, transactionTime, transactionLatitudeLongitude, transactionLatitudeLongitudeAddress, transactionLocation, messageId, entrustUserPhone, entrustUserName, entrustIdCard, entrustId));
     }
 
     @ApiOperation("获取用户作为卖家的交易评价列表（分页）")

alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

@@ -18,13 +18,10 @@ import shop.alien.config.properties.RiskControlProperties;
 import shop.alien.entity.result.BusinessException;
 import shop.alien.entity.second.*;
 import shop.alien.entity.second.vo.SecondEntrustUserDTO;
+import shop.alien.entity.store.*;
 import shop.alien.mapper.second.SecondRiskControlRecordMapper;
 import shop.alien.entity.second.vo.SecondTradeRecordVo;
 import shop.alien.entity.second.vo.SellerEvaluationVo;
-import shop.alien.entity.store.LifeMessage;
-import shop.alien.entity.store.LifeNotice;
-import shop.alien.entity.store.LifeUser;
-import shop.alien.entity.store.StoreDictionary;
 import shop.alien.entity.store.vo.WebSocketVo;
 import shop.alien.mapper.LifeMessageMapper;
 import shop.alien.mapper.LifeNoticeMapper;
@@ -121,6 +118,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
                 secondEntrustUser.setEntrustUserPhone(trade.getEntrustUserPhone());
                 secondEntrustUser.setEntrustUserName(trade.getEntrustUserName());
                 secondEntrustUser.setEntrustIdCard(trade.getEntrustIdCard());
+                secondEntrustUser.setEntrustTradeNo(trade.getTradeNo());
                 secondEntrustUserMapper.insert(secondEntrustUser);
             }
 
@@ -588,7 +586,22 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             wrapper.eq("trade.delete_flag", 0);
             wrapper.apply("((trade.buyer_id = '" + sideId + "' and trade.seller_id = '" + userId + "') || (trade.buyer_id = '" + userId + "' and trade.seller_id = '" + sideId + "'))");
             wrapper.orderByDesc("trade.created_time");
-            return secondTradeRecordMapper.getTradeRecord(wrapper);
+            List<SecondTradeRecordVo> vo = secondTradeRecordMapper.getTradeRecord(wrapper);
+            if (vo.size() > 0) {
+                for (SecondTradeRecordVo item : vo) {
+                    // 查询商家委托信息
+                    LambdaQueryWrapper<SecondEntrustUser> entrustWrapper = new LambdaQueryWrapper<>();
+                    entrustWrapper.eq(SecondEntrustUser::getEntrustTradeId, item.getId());
+                    SecondEntrustUser entrustUser = secondEntrustUserMapper.selectOne(entrustWrapper);
+                    if ( entrustUser != null ) {
+                        item.setEntrustId(entrustUser.getId());
+                        item.setEntrustUserPhone(entrustUser.getEntrustUserPhone());
+                        item.setEntrustUserName(entrustUser.getEntrustUserName());
+                        item.setEntrustIdCard(entrustUser.getEntrustIdCard());
+                    }
+                }
+            }
+            return vo;
         } catch (Exception e) {
             log.error("SecondTradeRecordServiceImpl.getTradeRecord(): Error Msg={}", e.getMessage());
             throw new Exception(e);
@@ -671,14 +684,17 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             String receiverId = "user_" + lifeUser.getUserPhone();
 
             if (entrustId != null) {
-                // 添加商家委托信息
-                SecondEntrustUser secondEntrustUser = new SecondEntrustUser();
-                secondEntrustUser.setId(entrustId);
-                secondEntrustUser.setEntrustTradeId(tradeId);
-                secondEntrustUser.setEntrustUserPhone(userPhone);
-                secondEntrustUser.setEntrustUserName(userName);
-                secondEntrustUser.setEntrustIdCard(idCard);
-                secondEntrustUserMapper.updateById(secondEntrustUser);
+                LambdaUpdateWrapper<SecondEntrustUser> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(SecondEntrustUser::getId, entrustId);
+                if (StringUtils.isBlank(userPhone) && StringUtils.isBlank(userName) && StringUtils.isBlank(idCard)) {
+                    updateWrapper.set(SecondEntrustUser::getDeleteFlag, 1);
+                } else {
+                    updateWrapper.set(SecondEntrustUser::getEntrustTradeId, tradeId);
+                    updateWrapper.set(SecondEntrustUser::getEntrustUserPhone, userPhone);
+                    updateWrapper.set(SecondEntrustUser::getEntrustUserName, userName);
+                    updateWrapper.set(SecondEntrustUser::getEntrustIdCard, idCard);
+                }
+                secondEntrustUserMapper.update(null, updateWrapper);
             }