寄售单详情展示结款转账信息

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/ConsignSaleDetailVo.java

@@ -5,6 +5,7 @@ import com.wwdz.ch.db.domain.UserVo;
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class ConsignSaleDetailVo implements Entity {
@@ -43,4 +44,9 @@ public class ConsignSaleDetailVo implements Entity {
      * 发布人信息
      */
     private UserVo userVo;
+
+    /**
+     * 结款转账信息
+     */
+    private Map<String, Object> payInfo;
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ConsignSaleServiceImpl.java

@@ -173,9 +173,8 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             User user = cacheUtil.getAppletUsers(userId);
             UserVo userVo = new UserVo();
             userVo.setNickname(user.getNickname());
-            userVo.setPhone(userVo.getPhone());
+            userVo.setPhone(user.getMobile());
             consignSaleDetailVo.setUserVo(userVo);
-
             consignSaleDetailVo.setConsignSaledId(dto.getSaleId());
             consignSaleDetailVo.setSystemState(consignSale.getSystemState());
             consignSaleDetailVo.setSystemStateName(ConsignSaleEnum.SaleForSysStateEnum.getNameByCode(consignSale.getSystemState()));
@@ -216,6 +215,18 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                 consignSaleRecordVoList.add(consignSaleRecordVo);
             });
             consignSaleDetailVo.setConsignSaleRecordVoList(consignSaleRecordVoList);
+
+            //如果寄售单状态是已完成，则展示结款转账信息
+            if (consignSale.getSystemState() == ConsignSaleEnum.SaleForSysStateEnum.FINISH.getCode()) {
+                int settleAmount = consignSale.getSettleAmount();
+                String amount = PriceUtil.convertPriceByTwo(settleAmount);
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", user.getNickname());
+                map.put("phone", user.getMobile());
+                map.put("settleAmount", amount);
+                map.put("credential", consignSale.getCredential());
+                consignSaleDetailVo.setPayInfo(map);
+            }
             return Result.success(consignSaleDetailVo);
         } catch (Exception e) {
             logger.info("查询寄售单详情error:{}", e);
@@ -523,6 +534,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             map.put("name", user.getNickname());
             map.put("phone", user.getMobile());
             map.put("settleAmount", amount);
+            map.put("credential", consignSale.getCredential());
             return Result.success(map);
         } catch (Exception e) {
             logger.error("查询结款信息error : {}", e);