Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

# Conflicts:
#	jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java

@@ -13,6 +13,7 @@ import com.jsowell.common.util.poi.ExcelUtil;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.PileMerchantInfo;
 import com.jsowell.pile.dto.ManualSettlementDTO;
+import com.jsowell.pile.dto.QueryMerchantOrderDTO;
 import com.jsowell.pile.dto.QueryOrderDTO;
 import com.jsowell.pile.service.IOrderBasicInfoService;
 import com.jsowell.pile.service.IPileMerchantInfoService;
@@ -155,7 +156,7 @@ public class OrderBasicInfoController extends BaseController {
 	 */
 	@PreAuthorize("@ss.hasPermi('order:order:list')")
 	@PostMapping("/getMerchantOrderList")
-	public TableDataInfo getMerchantOrderList(@RequestBody QueryOrderDTO dto) {
+	public TableDataInfo getMerchantOrderList(@RequestBody QueryMerchantOrderDTO dto) {
 		return getDataTable(orderBasicInfoService.getMerchantOrderInfoList(dto));
 	}
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantOrderDTO.java

@@ -0,0 +1,69 @@
+package com.jsowell.pile.dto;
+
+import lombok.Data;
+
+/**
+ * 获取运营商订单列表dto
+ *
+ * @author Lemon
+ * @Date 2023/7/10 9:56
+ */
+@Data
+public class QueryMerchantOrderDTO {
+    /**
+     * 充电桩编号
+     */
+    private String pileSn;
+
+    /**
+     * 枪口号
+     */
+    private String connectorCode;
+
+    /**
+     * 会员id
+     */
+    private String memberId;
+
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    // 交易流水号
+    private String transactionCode;
+
+    /**
+     * 手机号
+     */
+    private String mobileNumber;
+
+    /**
+     * 站点Id
+     */
+    private String stationId;
+
+    /**
+     * 运营商Id
+     */
+    private String merchantId;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    private int pageSize;
+
+    private int pageNum;
+}

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java

@@ -64,7 +64,7 @@ public class QueryOrderDTO extends BaseEntity {
 	 */
 	private String endTime;
 
-	private int pageSize;
+	// private int pageSize;
-
+	//
-	private int pageNum;
+	// private int pageNum;
 }

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java

@@ -2,10 +2,7 @@ package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.OrderDetail;
-import com.jsowell.pile.dto.IndexQueryDTO;
+import com.jsowell.pile.dto.*;
-import com.jsowell.pile.dto.QueryOrderDTO;
-import com.jsowell.pile.dto.QueryPersonPileDTO;
-import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
 import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
 import com.jsowell.pile.vo.uniapp.OrderVO;
@@ -217,5 +214,5 @@ public interface OrderBasicInfoMapper {
 	 * @param dto
 	 * @return
 	 */
-	List<MerchantOrderInfoVO> getMerchantOrderInfoList(@Param("dto") QueryOrderDTO dto);
+	List<MerchantOrderInfoVO> getMerchantOrderInfoList(@Param("dto") QueryMerchantOrderDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java

@@ -277,7 +277,7 @@ public interface IOrderBasicInfoService {
 	 * 获取运营商订单列表
 	 * @return
 	 */
-	List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto);
+	List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryMerchantOrderDTO dto);
 
 	/**
 	 * 生成订单逻辑

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -16,7 +16,6 @@ import com.huifu.adapay.model.Refund;
 import com.jsowell.adapay.common.CreateAdaPaymentParam;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
-import com.jsowell.common.core.domain.entity.SysDictData;
 import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
 import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
@@ -2065,7 +2064,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
      * @return
      */
     @Override
-    public List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto) {
+    public List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryMerchantOrderDTO dto) {
         int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
         int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize();
         String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7));
@@ -2141,22 +2140,22 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
             // 微信支付
             dto.setOrderBasicInfo(orderInfo);
 
+            Map<String, Object> weixinMap = adapayPayOrder(dto);
             // 从字典中获取使用汇付支付的站点
-            List<SysDictData> adapay_station = DictUtils.getDictCache("adapay_station");
+            // List<SysDictData> adapay_station = DictUtils.getDictCache("adapay_station");
-            List<String> stationIdList = Lists.newArrayList();
+            // List<String> stationIdList = Lists.newArrayList();
-            if (CollectionUtils.isNotEmpty(adapay_station)) {
+            // if (CollectionUtils.isNotEmpty(adapay_station)) {
-                for (SysDictData sysDictData : adapay_station) {
+            //     for (SysDictData sysDictData : adapay_station) {
-                    stationIdList.add(sysDictData.getDictValue());
+            //         stationIdList.add(sysDictData.getDictValue());
-                }
+            //     }
-            }
+            // }
-            Map<String, Object> weixinMap;
+            // if (stationIdList.contains(orderInfo.getStationId())) {
-            if (stationIdList.contains(orderInfo.getStationId())) {
+            //     logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId());
-                logger.info("该站点:{}在字典中配置了使用汇付支付", orderInfo.getStationId());
+            //     weixinMap = adapayPayOrder(dto);
-                weixinMap = adapayPayOrder(dto);
+            // } else {
-            } else {
+            //     logger.info("该站点:{}使用微信支付", orderInfo.getStationId());
-                logger.info("该站点:{}使用微信支付", orderInfo.getStationId());
+            //     weixinMap = wechatPayOrder(dto);
-                weixinMap = wechatPayOrder(dto);
+            // }
-            }
 
             // 返回微信支付参数
             resultMap.put("weixinMap", weixinMap);

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java

@@ -529,7 +529,7 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
 			// 只修改一个枪口的状态
 			num = pileConnectorInfoMapper.updateConnectorStatus(pileConnectorCode, status);
 			deleteRedisByPileSn(pileSn);
-			redisCache.setCacheObject(redisKey, status);
+			redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_1h);
 
 			// TODO 推送联联平台 设备状态变化推送接口  ConnectorStatusInfo
 

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -769,8 +769,8 @@ export default {
             }
         },
         areaCode(area){
-            let arr = this.areaList.find(item => item.value ==area)
+            let arr = this.areaList.find(item => item.value === area);
-            console.log('区地址编码',area,this.options)
+            // console.log("areaCode code:{}, value:{}", area, arr);
             if (arr ==null){
                 return '一'
             } else{
@@ -848,7 +848,7 @@ export default {
     created() {
         this.selectAdapayMember();
         this.jsonHttp();
-        this.cityList = text.cityList
+        this.cityList = text.cityList;
     },
 };
 </script>