更新9.29

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralOrders.java

@@ -111,5 +111,7 @@ public class    IntegralOrders extends BaseEntity {
     private String actualPayment;
     private String makeChange;
 
+    private Integer addressId;
+
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java

@@ -30,7 +30,7 @@ public interface IntegralOrdersService {
      * @param id 主键
      * @return 实例对象
      */
-    IntegralOrders queryById(Integer id);
+    IntegralOrdersVO queryById(Integer id);
 
     /**
      * 分页查询

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fuint.business.integral.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.HashUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
@@ -38,8 +39,10 @@ import com.fuint.business.order.service.AllOrderInfoService;
 import com.fuint.business.order.vo.Excel.HangBillExcel;
 import com.fuint.business.store.entity.MtStore;
 import com.fuint.business.store.mapper.MtStoreMapper;
+import com.fuint.business.userManager.entity.MtUserExpressAddress;
 import com.fuint.business.userManager.entity.UserBalance;
 import com.fuint.business.userManager.mapper.LJUserMapper;
+import com.fuint.business.userManager.mapper.MtUserExpressAddressMapper;
 import com.fuint.business.userManager.service.UserBalanceService;
 import com.fuint.business.userManager.vo.LJUserVo;
 import com.fuint.common.dto.AccountInfo;
@@ -89,6 +92,9 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
 
+    @Autowired
+    private MtUserExpressAddressMapper mtUserExpressAddressMapper;
+
 
     /**
      * 通过ID查询单条数据
@@ -97,8 +103,24 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
      * @return 实例对象
      */
     @Override
-    public IntegralOrders queryById(Integer id) {
+    public IntegralOrdersVO queryById(Integer id) {
-        return this.integralOrdersDao.queryById(id);
+        IntegralOrders integralOrders = this.integralOrdersDao.queryById(id);
+        IntegralOrdersVO integralOrdersVO = BeanUtil.copyProperties(integralOrders, IntegralOrdersVO.class);
+        if (ObjectUtil.isNotEmpty(integralOrders)) {
+            // 查询数据 油站信息 预留地址
+            MtUserExpressAddress mtUserExpressAddress = mtUserExpressAddressMapper.selectById(integralOrders.getAddressId());
+            if (ObjectUtil.isNotEmpty(mtUserExpressAddress)) {
+                integralOrdersVO.setAddrName(mtUserExpressAddress.getName());
+                integralOrdersVO.setAddrMobile(mtUserExpressAddress.getMobile());
+            }
+            //查询油站地址
+            MtStore mtStore = mtStoreMapper.selectById(integralOrders.getStoreId());
+            if (ObjectUtil.isNotEmpty(mtStore)) {
+                integralOrdersVO.setStoreName(mtStore.getName());
+                integralOrdersVO.setStoreAddress(mtStore.getAddress());
+            }
+        }
+        return integralOrdersVO;
     }
 
     /**

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java

@@ -362,9 +362,10 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
                         Integer points = Integer.parseInt(jsonArray.getJSONObject(0).get("integral").toString());
                         integralSettings1.setIntegral(points);
                     }
-                    integralSettings1.setIntegralName("第" + i + 1 + "天");
+                    integralSettings1.setIntegralName("第" + (i + 1) + "天");
                     integralSettingsList.add(integralSettings1);
                 }
+                integralSettingsVo.setIntegralSettings(integralSettingsList);
             }else if (ObjectUtil.isNotEmpty(integralSettings.getSignApplicableRules()) && integralSettings.getSignApplicableRules() == 1) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     String day = jsonArray.getJSONObject(i).get("day").toString();

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java

@@ -19,6 +19,7 @@ public class IntegralOrdersVO extends IntegralOrders {
     private String addrMobile;
     private String address;
     private String storeName;
+    private String storeAddress;
 
 
 //    private String paidInfo;