update 2miner 店铺增专用网络费率

src/main/java/com/m2pool/lease/entity/LeaseOrderItem.java

@@ -197,5 +197,10 @@ public class LeaseOrderItem implements Serializable {
      */
     private Boolean type;
 
+    /**
+     * 收卖家手续费率
+     */
+    private BigDecimal feeRate;
+
 
 }

src/main/java/com/m2pool/lease/mapper/LeaseOrderItemMapper.java

@@ -1,6 +1,7 @@
 package com.m2pool.lease.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.m2pool.lease.dto.OrderItemShopOpenDto;
 import com.m2pool.lease.dto.OrderStatusDto;
 import com.m2pool.lease.dto.v2.OrderTimeInfoDto;
 import com.m2pool.lease.entity.LeaseOrderItem;
@@ -109,4 +110,11 @@ public interface LeaseOrderItemMapper extends BaseMapper<LeaseOrderItem> {
      * @return 更新行数
      */
     int updatePracticalPowerBatch(@Param("list") List<LeaseOrderItem> list);
+
+    /**
+     * 通过订单详情ID列表查询对应的店铺isOpen状态
+     * @param orderItemIds 订单详情ID列表
+     * @return 订单项和店铺开启状态列表
+     */
+    List<OrderItemShopOpenDto> selectOrderItemShopOpenMap(@Param("orderItemIds") List<Long> orderItemIds);
 }

src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java

@@ -927,6 +927,7 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
                     .numbers(orderInfoVo.getNumbers())
                     .type(leaseMachine.getType())
                     .theoryPower(theoryHashRate)
+                    .feeRate(leaseShop.getFeeRate())
                     .build();
             //Long timestamp = startTime + orderInfoVo.getLeaseTime() * 24 * 60 * 60 * 1000L;
             //开发环境
@@ -1062,6 +1063,11 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
         Map<String,ClientMessage<MiningConfigDto>> macMessageMap = new HashMap<>();
         List<LeaseOrderMining> orderMiningList = new ArrayList<>();
 
+        List<OrderItemShopOpenDto> orderItemShopOpenList = leaseOrderItemMapper.selectOrderItemShopOpenMap(
+                new ArrayList<>(machineOrderItemIdMap.values()));
+        Map<Long, OrderItemShopOpenDto> collect = orderItemShopOpenList.stream().collect(Collectors.toMap(OrderItemShopOpenDto::getId,Function.identity()));
+
+
         for (OrderMiningInfoDto orderMiningInfoDto : orderMiningInfo) {
             MiningConfigDto miningConfigDto = coinAndAlgoMap.get(orderMiningInfoDto.getCoinConfigId());
             Long machineId = orderMiningInfoDto.getMachineId();
@@ -1076,6 +1082,10 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
             String poolUrl = miningConfigDto.getPool();
             String poolUser = orderMiningInfoDto.getPoolUser();
             String poolWorkerId = orderMiningInfoDto.getWorkerId();
+            OrderItemShopOpenDto orderItemShopOpenDto = collect.get(orderItemId);
+            if (orderItemShopOpenDto != null && orderItemShopOpenDto.getIsOpen()){
+                poolUrl = miningConfigDto.getPoolProxyUrl();
+            }
             //这里因为orderMiningInfo 存在ASIC 的信息可能为空
             if (leaseMachine != null){
                 String mac = leaseMachine.getHostMac();

src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java

@@ -149,9 +149,14 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
         if (byId.getDel()){
             return Result.fail("修改失败,店铺已被删除");
         }
-        if (shopVo.getIsOpen() != null && shopVo.getIsOpen()){
+        if (shopVo.getIsOpen() != null && !byId.getIsOpen().equals(shopVo.getIsOpen())){
+            if (shopVo.getIsOpen()){
                 leaseShop.setFeeRate(leaseShop.getFeeRate().add(BigDecimal.valueOf(0.02)));
+            }else{
+                leaseShop.setFeeRate(leaseShop.getFeeRate().subtract(BigDecimal.valueOf(0.02)));
             }
+        }
+
         boolean save = updateById(leaseShop);
         if (save) {
             return Result.success("修改店铺成功");
@@ -195,13 +200,17 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
                     .id(leaseShop.getId())
                     .name(leaseShop.getName())
                     .image(leaseShop.getImage())
-                    .feeRate(leaseShop.getFeeRate().subtract(leaseShop.getNetworkFee()).setScale(4, RoundingMode.HALF_UP))
+                    .feeRate(leaseShop.getFeeRate())
                     .description(leaseShop.getDescription())
                     .state(leaseShop.getState())
                     .isOpen(leaseShop.getIsOpen())
-                    .networkFee(leaseShop.getNetworkFee())
+                    .networkFee(BigDecimal.ZERO)
                     .del(leaseShop.getDel())
                     .build();
+            if (leaseShop.getIsOpen()){
+                build.setFeeRate(leaseShop.getFeeRate().subtract(leaseShop.getNetworkFee()).setScale(4, RoundingMode.HALF_UP));
+                build.setNetworkFee(leaseShop.getNetworkFee());
+            }
 
         }
         return Result.success(build);
@@ -220,7 +229,13 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
                     .state(leaseShop.getState())
                     .feeRate(leaseShop.getFeeRate())
                     .del(leaseShop.getDel())
+                    .networkFee(BigDecimal.ZERO)
+                    .isOpen(leaseShop.getIsOpen())
                     .build();
+            if (leaseShop.getIsOpen()){
+                build.setFeeRate(leaseShop.getFeeRate().subtract(leaseShop.getNetworkFee()).setScale(4, RoundingMode.HALF_UP));
+                build.setNetworkFee(leaseShop.getNetworkFee());
+            }
 
         }
         return Result.success(build);

src/main/resources/mapper/lease/LeaseOrderItemMapper.xml

@@ -158,4 +158,16 @@
         )
     </update>
 
+    <select id="selectOrderItemShopOpenMap" resultType="com.m2pool.lease.dto.OrderItemShopOpenDto">
+        SELECT
+            oi.id,
+            ls.is_open AS isOpen
+        FROM lease_order_item oi
+        JOIN lease_shop ls ON oi.shop_id = ls.id
+        WHERE oi.id IN
+        <foreach item="id" collection="orderItemIds" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
 </mapper>