审核不通过订单回显展示最新的开店费用

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/openShop/OpenShopServiceImpl.java

@@ -233,10 +233,10 @@ public class OpenShopServiceImpl implements OpenShopService {
             OpenShopApplyOrderVo openShopApplyOrderVo = new OpenShopApplyOrderVo();
             long userId = dto.getUserId();
             OpenShopApplyOrder openShopApplyOrder = openShopApplyOrderDao.findByUserId(userId);
-            if (openShopApplyOrder == null) {
             OpenShopCostConfig openShopCostConfig = openShopCostConfigDao.findOne();
             long openShopAmount = openShopCostConfig.getOpenShopAmount();
             openShopApplyOrderVo.setOpenShopAmount(PriceUtil.convertPriceFenToYuan(openShopAmount));
+            if (openShopApplyOrder == null) {
                 //原始开店费300元
                 openShopApplyOrderVo.setOpenShopDiscountAmount(PriceUtil.convertPriceFenToYuan(30000L - openShopAmount));
                 return Result.success(openShopApplyOrderVo);
@@ -254,10 +254,13 @@ public class OpenShopServiceImpl implements OpenShopService {
             openShopApplyOrderVo.setCardId(userBankCard.getCardId());
             openShopApplyOrderVo.setBankName(userBankCard.getBankName());
             openShopApplyOrderVo.setName(userBankCard.getName());
+            if (openShopApplyOrder.getState() == OpenShopApplyOrderEnum.StateEnum.PRE_PAY.getCode()) {
                 openShopApplyOrderVo.setOpenShopAmount(PriceUtil.convertPriceFenToYuan(openShopApplyOrder.getOpenShopAmount()));
-
+            }
             //查询开店费缴纳订单,用于未支付订单
-            if (openShopApplyOrder.getState() == OpenShopApplyOrderEnum.StateEnum.PRE_PAY.getCode()) {
+            if (openShopApplyOrder.getState() == OpenShopApplyOrderEnum.StateEnum.PRE_PAY.getCode()
+            || openShopApplyOrder.getState() == OpenShopApplyOrderEnum.StateEnum.PASSED.getCode()
+            || openShopApplyOrder.getState() == OpenShopApplyOrderEnum.StateEnum.PRE_AUDIT.getCode()) {
                 OpenShopCostRecord openShopCostRecord = openShopCostRecordDao.findByUserId(userId);
                 openShopApplyOrderVo.setOpenShopCostOrderId(openShopCostRecord.getOpenShopCostOrderId());
             }