Merge remote-tracking branch 'origin/developerD' into developer

src/main/java/com/caimei365/tools/controller/BaseApi.java

@@ -69,14 +69,12 @@ public class BaseApi {
     }*/
 
     /**
-     * 数据ip地址
-     * @param startId
-     * @param endId
+     * 临时接口
      */
-    /*@GetMapping("/base/oldData")
-    public void oldData(Integer startId, Integer endId) {
-        cmBehaviorRecordService.setIpAddress(startId,endId);
-    }*/
+    @GetMapping("/base/oldData")
+    public void oldData() {
+        cmBehaviorRecordService.setProductCostProportional();
+    }
 
 }
 

src/main/java/com/caimei365/tools/mapper/CmBehaviorRecordMapper.java

@@ -4,7 +4,6 @@ import com.caimei365.tools.model.po.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -47,6 +46,17 @@ public interface CmBehaviorRecordMapper {
      */
     List<CmUserPo> findList(@Param("startId") Integer startId, @Param("endId") Integer endId);
 
+    /**
+     * sku信息
+     * @return
+     */
+    List<CmSkuPo> skuList();
+
+    /**
+     * 修改sku信息
+     * @param skuPo
+     */
+    void updateSku(CmSkuPo skuPo);
     /**
      * 修改老数据ip所在地
      * @param userPo

src/main/java/com/caimei365/tools/model/po/CmSkuPo.java

@@ -0,0 +1,69 @@
+package com.caimei365.tools.model.po;
+
+import lombok.Data;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2023/6/29
+ */
+@Data
+public class CmSkuPo {
+    /**
+     * skuId
+     */
+    private Integer skuId;
+    /**
+     * 商品Id
+     */
+    private Integer productId;
+    /**
+     * 组织Id
+     */
+    private Integer organizeId;
+    /**
+     * 市场价
+     */
+    private Double normalPrice;
+    /**
+     * 机构价格（同为二手商品的交易价）
+     */
+    private Double price;
+    /**
+     * 启用阶梯价格标识 0否 1是
+     */
+    private Integer ladderPriceFlag;
+    /**
+     * 成本类型：1固定成本 2比例成本
+     */
+    private Integer costCheckFlag;
+    /**
+     * 成本价
+     */
+    private Double costPrice;
+    /**
+     * 分账供应商成本比例
+     */
+    private Double shopPercent;
+    /**
+     * 分账组织佣金比例
+     */
+    private Double organizePercent;
+    /**
+     * 分账采美佣金比例
+     */
+    private Double cmPercent;
+    /**
+     * 库存(同为二手商品的数量)
+     */
+    private Integer stock;
+    /**
+     * 包装规格
+     */
+    private String unit;
+    /**
+     * 起订量
+     */
+    private Integer minBuyNumber;
+}

src/main/java/com/caimei365/tools/service/CmBehaviorRecordService.java

@@ -18,6 +18,8 @@ public interface CmBehaviorRecordService {
 
     void setIpAddress(Integer startId, Integer endId) throws IOException;
 
+    void setProductCostProportional();
+
     void updateBehaviorUser();
 
     void insertBehaviorUser();

src/main/java/com/caimei365/tools/service/impl/CmBehaviorRecordServiceImpl.java

@@ -2,11 +2,9 @@ package com.caimei365.tools.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.caimei365.tools.mapper.CmBehaviorRecordMapper;
-import com.caimei365.tools.model.po.AddressPo;
-import com.caimei365.tools.model.po.CmBehaviorRecordPo;
-import com.caimei365.tools.model.po.CmUserPo;
-import com.caimei365.tools.model.po.IpSavePo;
+import com.caimei365.tools.model.po.*;
 import com.caimei365.tools.service.CmBehaviorRecordService;
+import io.netty.util.internal.MathUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,9 +14,11 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -317,6 +317,28 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
         }
     }
 
+    @Override
+    public void setProductCostProportional() {
+        List<CmSkuPo> skuList = recordMapper.skuList();
+        skuList.forEach(sku -> {
+            if (null != sku.getPrice() && 0 != sku.getPrice()) {
+                // 供应商比例
+                double shopPercent = (sku.getCostPrice()/sku.getPrice()*100);
+                double rint = Math.rint(shopPercent);
+                // 分账组织佣金比例
+                double organizePercent = 0d;
+                // 分账采美佣金比例
+                double cmPercent = 100d - rint;
+                sku.setShopPercent(rint);
+                sku.setOrganizePercent(organizePercent);
+                sku.setCmPercent(cmPercent);
+                // 成本类型 -> 比例成本
+                sku.setCostCheckFlag(2);
+                recordMapper.updateSku(sku);
+            }
+        });
+    }
+
     @Override
     public void updateBehaviorUser() {
         log.info("====合并IP====");

src/main/resources/mapper/CmBehaviorRecordMapper.xml

@@ -26,6 +26,33 @@
     <select id="findList" resultType="com.caimei365.tools.model.po.CmUserPo">
         SELECT userID, registerIP FROM USER where userID between #{startId} and #{endId}
     </select>
+    <select id="skuList" resultType="com.caimei365.tools.model.po.CmSkuPo">
+        select
+            skuId,
+            productId,
+            organizeId,
+            normalPrice,
+            price,
+            ladderPriceFlag,
+            costCheckFlag,
+            ifnull(costPrice,0) as costPrice,
+            shopPercent,
+            organizePercent,
+            cmPercent,
+            stock,
+            unit,
+            minBuyNumber
+        from cm_sku
+    </select>
+
+    <update id="updateSku">
+        update cm_sku
+        set shopPercent = #{shopPercent},
+            organizePercent = #{organizePercent},
+            cmPercent = #{cmPercent},
+            costCheckFlag = #{costCheckFlag}
+            where skuId = #{skuId}
+    </update>
     <update id="updateOldData">
         UPDATE USER
         SET ipAddress = #{ipAddress}