后台申请单详情

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

@@ -15,11 +15,13 @@ import com.wwdz.ch.db.dao.FollowFansRecordDao;
 import com.wwdz.ch.db.dao.UserDao;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.dao.distribution.UserBankCardDao;
+import com.wwdz.ch.db.dao.openShop.GuaranteeMoneyRecordDao;
 import com.wwdz.ch.db.dao.openShop.OpenShopApplyOrderDao;
 import com.wwdz.ch.db.dao.openShop.OpenShopCostRecordDao;
 import com.wwdz.ch.db.domain.CollectorWhiteList;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.UserBankCard;
+import com.wwdz.ch.db.domain.openShop.GuaranteeMoneyRecord;
 import com.wwdz.ch.db.domain.openShop.OpenShopApplyOrder;
 import com.wwdz.ch.db.domain.openShop.OpenShopCostRecord;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
@@ -71,6 +73,9 @@ public class SysOpenShopApplyOrderServiceImpl implements SysOpenShopApplyOrderSe
     @Autowired
     WxPayServiceApi wxPayServiceApi;
 
+    @Autowired
+    GuaranteeMoneyRecordDao guaranteeMoneyRecordDao;
+
     @Override
     public Result findList(OpenShopApplyOrderRequestDto dto) {
         try {
@@ -126,6 +131,12 @@ public class SysOpenShopApplyOrderServiceImpl implements SysOpenShopApplyOrderSe
             openShopApplyOrderVo.setBankName(userBankCard.getBankName());
             openShopApplyOrderVo.setName(userBankCard.getName());
             openShopApplyOrderVo.setOpenShopAmount(PriceUtil.convertPriceFenToYuan(openShopApplyOrder.getOpenShopAmount()));
+
+            //查询质保金
+            GuaranteeMoneyRecord guaranteeMoneyRecord = guaranteeMoneyRecordDao.findByUserId(userId);
+            if (guaranteeMoneyRecord != null) {
+                openShopApplyOrderVo.setGuaranteeAmount(PriceUtil.convertPriceFenToYuan(guaranteeMoneyRecord.getAmount()));
+            }
             return Result.success(openShopApplyOrderVo);
         }  catch (Exception e) {
             logger.error("查询申请开店订单列表失败 error:{}", e);
@@ -176,7 +187,6 @@ public class SysOpenShopApplyOrderServiceImpl implements SysOpenShopApplyOrderSe
                         updateDto.setOpenShopCostOrderId(openShopCostRecord.getOpenShopCostOrderId());
                         updateDto.setIsValid(false);
                         openShopCostRecordDao.update(openShopCostRecord);
-
                     }
                 }
             }

ch-core/src/main/java/com/wwdz/ch/core/entity/openShop/OpenShopApplyOrderVo.java

@@ -66,6 +66,11 @@ public class OpenShopApplyOrderVo implements Entity {
      */
     private String openShopAmount;
 
+    /**
+     * 质保金
+     */
+    private String guaranteeAmount;
+
     /**
      * 开店优惠金额
      */
@@ -88,4 +93,6 @@ public class OpenShopApplyOrderVo implements Entity {
      * 备注说明
      */
     private String remark;
+
+
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/openShop/GuaranteeMoneyRecordDao.java

@@ -16,4 +16,7 @@ public interface GuaranteeMoneyRecordDao {
      * @return
      */
     boolean checkValidRecord(long userId);
+
+
+    GuaranteeMoneyRecord findByUserId(long userId);
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/openShop/GuaranteeMoneyRecordDaoImpl.java

@@ -46,4 +46,14 @@ public class GuaranteeMoneyRecordDaoImpl implements GuaranteeMoneyRecordDao {
         criteria.andTransactionIdIsNotNull();
         return guaranteeMoneyRecordMapper.countByExample(example) > 0;
     }
+
+
+    @Override
+    public GuaranteeMoneyRecord findByUserId(long userId) {
+        GuaranteeMoneyRecordExample example = new GuaranteeMoneyRecordExample();
+        GuaranteeMoneyRecordExample.Criteria criteria = example.createCriteria();
+        criteria.andUserIdEqualTo(userId);
+        example.setOrderByClause("create_time desc");
+        return guaranteeMoneyRecordMapper.selectOneByExample(example);
+    }
 }