预发机申请循环时间

商户同步交易额到商户表

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMerchant.java

@@ -167,7 +167,7 @@ public class KxsMerchant extends Model<KxsMerchant> implements Serializable {
      *  总交易额
      */
     @Schema(description = "总交易额")
-    private String totalAmt;
+    private BigDecimal totalAmt;
 
 
 

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/merchant/MerchantDetailVO.java

@@ -83,7 +83,7 @@ public class MerchantDetailVO implements Serializable {
      * 商户总交易额
      */
     @Schema(description = "商户总交易额")
-    private BigDecimal tradeTotal;
+    private BigDecimal totalAmt;
 
 
     /**

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMerchantServiceImpl.java

@@ -61,7 +61,6 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
     private final KxsMerchantMapper kxsMerchantMapper;
     private final KxsMachineRatioMapper kxsMachineRatioMapper;
     private final RemoteOldService remoteOldService;
-    private final RemoteKxsStatService remoteKxsStatService;
 
 
 
@@ -83,7 +82,7 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
         KxsMerchant mchInfo = getById(merchantId);
         Optional.ofNullable(mchInfo).orElseThrow(() -> new GlobalCustomerException(ProductErrorTypeEnum.DATA_EMPTY.getDescription()));
 
-        BeanUtil.copyProperties(mchInfo,merchantDetailVO);
+        BeanUtil.copyProperties(mchInfo, merchantDetailVO);
         //机具信息
         KxsMachine kxsMachine = kxsMachineMapper.selectById(mchInfo.getMachineId());
         merchantDetailVO.setPosSn(kxsMachine.getPosSn());
@@ -92,8 +91,6 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
         merchantDetailVO.setIsAct(kxsMachine.getIsAct());
         KxsBrand brand = kxsBrandMapper.selectById(kxsMachine.getBrandId());
         merchantDetailVO.setBrandName(brand.getName());
-        //查询总交易额
-//        R<BigDecimal> res = remoteKxsStatService.loadByMchTotalTrade(mchInfo.getId(), SecurityConstants.FROM_IN);
 
         //查询调费调升记录
         KxsMachineRatio upFee = kxsMachineRatioMapper.selectOne(Wrappers.<KxsMachineRatio>lambdaQuery()

kxs-stat/kxs-stat-api/src/main/java/com/kxs/stat/api/feign/RemoteKxsStatService.java

@@ -63,12 +63,4 @@ public interface RemoteKxsStatService {
 	 */
 	@PostExchange("/stat/getLkbTradeAmt")
 	KxsLkbTrade getLkbTradeAmt(@RequestBody KxsLkbTrade lkbTrade, @RequestHeader(SecurityConstants.FROM) String from);
-
-	/**
-	 * @param mchId MCH ID
-	 * @param from  从
-	 * @return {@link R}<{@link BigDecimal}>
-	 */
-	@GetExchange("/mchTrade/loadByMchTotalTrade")
-	R<BigDecimal> loadByMchTotalTrade(@RequestParam("mchId") Integer mchId, @RequestHeader(SecurityConstants.FROM) String from);
 }

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/controller/KxsMchTradeController.java

@@ -21,17 +21,6 @@ public class KxsMchTradeController {
 
     private final KxsMerchantTradeService kxsMerchantTradeService;
 
-    /**
-     * 查询商户总交易额
-     * @param mchId MCH ID
-     * @return {@link R}
-     */
-    @GetMapping("/loadByMchTotalTrade")
-    public R loadByMchTotalTrade(@RequestParam("mchId") Long mchId) {
-
-        return kxsMerchantTradeService.loadByMchTotalTrade(mchId);
-    }
-
 
     /**
      * 商户交易记录

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -235,10 +235,10 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
                 adMachine.setDeliveryTime(LocalDateTime.now());
                 //如果是兑换券申请则更新循环时间
                 if(!param.getApplyType().equals(MachineOrderEnum.M_TYPE_RE.getType())){
-                    recycleEndTime = LocalDateTime.now();
+                    recycleEndTime = LocalDateTime.now().plusDays(ParamResolver.getInteger("RECYC_POS_MAX_DAY", 365));
                 }
                 adMachine.setRecycleEndTime(recycleEndTime);
-                adMachine.setRecycleStatus(MachineRecycleStatusEnum.CAN_RECYCLE_STATUS.getType());
+                adMachine.setRecycleStatus(MachineRecycleStatusEnum.UN_RECYCLE_STATUS.getType());
                 R<Boolean> result = remoteKxsProductService.updateByMachine(adMachine, SecurityConstants.FROM_IN);
                 if(!result.getData()){
                     throw new GlobalCustomerException(ErrorTypeEnum.REMOTE_DATA_ERROR.getDescription());

kxs-transfer/src/main/java/com/kxs/transfer/api/service/stat/KxsMerchantTradeService.java

@@ -4,11 +4,14 @@ import com.aliyun.dts.subscribe.clients.record.OperationType;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.mybatis.handler.MonthTableNameHandler;
+import com.kxs.product.api.model.KxsMerchant;
 import com.kxs.stat.api.model.KxsMerchantTrade;
 import com.kxs.stat.api.model.KxsUserActTrade;
+import com.kxs.transfer.api.mapper.product.KxsMerchantMapper;
 import com.kxs.transfer.api.mapper.stat.KxsMerchantTradeMapper;
 import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.transfer.api.model.table.FieldData;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -22,8 +25,11 @@ import java.util.Map;
  * @since 2024-05-07 17:25:06
  */
 @Service("kxsMerchantTradeService")
+@RequiredArgsConstructor
 public class KxsMerchantTradeService extends ServiceImpl<KxsMerchantTradeMapper, KxsMerchantTrade>{
 
+    private final KxsMerchantMapper kxsMerchantMapper;
+
     public void changeData(DMLData dmlData) {
         //修改的字段值
         Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
@@ -79,6 +85,12 @@ public class KxsMerchantTradeService extends ServiceImpl<KxsMerchantTradeMapper,
         }
         //删除线程，避免线程污染
         MonthTableNameHandler.removeData();
+
+        //添加总交易额
+        KxsMerchant kxsMerchant = kxsMerchantMapper.selectById(merchantTrade.getMerchantId());
+        if(kxsMerchant != null){
+            kxsMerchant.setTotalAmt(kxsMerchant.getTotalAmt().add(merchantTrade.getTradeAmt()));
+        }
     }
 }