修改了汇率接口

src/main/java/com/diaoyun/zion/chinafrica/bis/impl/NikeItemSpider.java

@@ -24,8 +24,10 @@ import java.util.concurrent.TimeoutException;
  */
 @Component("nikeItemSpider")
 public class NikeItemSpider implements IItemSpider {
+
     private static Logger logger = LoggerFactory.getLogger(NikeItemSpider.class);
 
+
     @Override
     public JSONObject captureItem(String targetUrl) throws URISyntaxException, IOException{
         JSONObject resultObj;

src/main/java/com/diaoyun/zion/chinafrica/client/TokenVerification.java

@@ -42,7 +42,8 @@ public class TokenVerification {
             "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfHomePageController.*(..))" +
             "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfUserInfoController.resetPassWord(..))" +
             "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfFeedbackController.getFeedbackList(..))" +
-            "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfUserInfoController.getUserIdentifyCode(..))")
+            "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfUserInfoController.getUserIdentifyCode(..))"+
+            "&&!execution(* com.diaoyun.zion.chinafrica.controller.TbCfFeeController.*(..))")
     public void controllerAspect() {
 
     }

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfFeeController.java

+package com.diaoyun.zion.chinafrica.controller;
+
+import com.diaoyun.zion.chinafrica.entity.TbCfFeeEntity;
+import com.diaoyun.zion.chinafrica.service.TbCfFeeService;
+import com.diaoyun.zion.master.base.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Map;
+
+/**
+ * 手续费Controller
+ */
+@RestController
+@RequestMapping("fee")
+public class TbCfFeeController {
+
+    @Autowired
+    private TbCfFeeService tbCfFeeService;
+
+    /**
+     * 查看所有运费模板
+     */
+    @GetMapping("/getRate")
+    public Result getRate(Double price) {
+        TbCfFeeEntity fee =  tbCfFeeService.getRateFee();
+        BigDecimal rate = fee.getFeeRate();
+        BigDecimal prices = new BigDecimal(price);
+        BigDecimal sum = prices.divide(rate,4,RoundingMode.HALF_UP);
+
+        return new Result<>(sum);
+    }
+
+
+}

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfFeeDao.java

@@ -15,4 +15,10 @@ public interface TbCfFeeDao extends BaseDao<TbCfFeeEntity> {
      * @return
      */
     TbCfFeeEntity getAvailableFee();
+
+    /**
+     * 获取当前后台人民币转成美元设置
+     * @return
+     */
+    TbCfFeeEntity getRateFee();
 }

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfFeeEntity.java

@@ -8,8 +8,8 @@ import java.util.Date;
  * 手续费实体
  * 表名 tb_cf_fee
  *
- * @author G
- * @date 2019-08-14 09:11:48
+ * @author LHB
+ * @date 2019-10-13 16:18:55
  */
 public class TbCfFeeEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -19,17 +19,21 @@ public class TbCfFeeEntity implements Serializable {
      */
     private String feeId;
     /**
-     * 收费类型
+     * 收费类型,1为百分比，目前只有一种收费方式
      */
     private Integer feeType;
     /**
-     * 是否生效
+     * 是否生效标志
      */
     private Integer enableFlag;
     /**
      * 收取费用百分比
      */
     private BigDecimal feePercent;
+    /**
+     * 设置美元转换
+     */
+    private BigDecimal feeRate;
 
     /**
      * 设置：收费id
@@ -45,27 +49,27 @@ public class TbCfFeeEntity implements Serializable {
         return feeId;
     }
     /**
-     * 设置：收费类型
+     * 设置：收费类型,1为百分比，目前只有一种收费方式
      */
     public void setFeeType(Integer feeType) {
         this.feeType = feeType;
     }
 
     /**
-     * 获取：收费类型
+     * 获取：收费类型,1为百分比，目前只有一种收费方式
      */
     public Integer getFeeType() {
         return feeType;
     }
     /**
-     * 设置：是否生效
+     * 设置：是否生效标志
      */
     public void setEnableFlag(Integer enableFlag) {
         this.enableFlag = enableFlag;
     }
 
     /**
-     * 获取：是否生效
+     * 获取：是否生效标志
      */
     public Integer getEnableFlag() {
         return enableFlag;
@@ -80,7 +84,21 @@ public class TbCfFeeEntity implements Serializable {
     /**
      * 获取：收取费用百分比
      */
+
     public BigDecimal getFeePercent() {
         return feePercent;
     }
+    /**
+     * 设置：设置美元转换
+     */
+    public void setFeeRate(BigDecimal feeRate) {
+        this.feeRate = feeRate;
+    }
+
+    /**
+     * 获取：设置美元转换
+     */
+    public BigDecimal getFeeRate() {
+        return feeRate;
+    }
 }

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfFeeService.java

@@ -74,4 +74,10 @@ public interface TbCfFeeService {
      * @return
      */
     TbCfFeeEntity getAvailableFee();
+
+    /**
+     * 获取当前生效的人民币转成美元设置
+     * @return
+     */
+    TbCfFeeEntity getRateFee();
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfFeeServiceImpl.java

 package com.diaoyun.zion.chinafrica.service.impl;
 
+
 import com.diaoyun.zion.chinafrica.dao.TbCfFeeDao;
 import com.diaoyun.zion.chinafrica.entity.TbCfFeeEntity;
 import com.diaoyun.zion.chinafrica.service.TbCfFeeService;
@@ -18,6 +19,7 @@ import java.util.Map;
  */
 @Service("tbCfFeeService")
 public class TbCfFeeServiceImpl implements TbCfFeeService {
+
     @Autowired
     private TbCfFeeDao tbCfFeeDao;
 
@@ -62,4 +64,10 @@ public class TbCfFeeServiceImpl implements TbCfFeeService {
 
         return tbCfFeeDao.getAvailableFee();
     }
+
+    @Override
+    public TbCfFeeEntity getRateFee() {
+
+        return tbCfFeeDao.getRateFee();
+    }
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -55,6 +55,7 @@ import static com.github.pagehelper.page.PageMethod.startPage;
 @Service("tbCfOrderService")
 public class TbCfOrderServiceImpl implements TbCfOrderService {
     private static Logger logger = LoggerFactory.getLogger(TbCfOrderServiceImpl.class);
+
     @Autowired
     private TbCfOrderDao tbCfOrderDao;
     @Autowired
@@ -75,6 +76,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     private TbCfCouponUseDao tbCfCouponUseDao;
     @Autowired
     private TbCfFinanceDao tbCfFinanceDao;
+
     @Autowired
     private TbCfExpressTemplateDao tbCfExpressTemplateDao;
     @Autowired
@@ -84,6 +86,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     private TbCfFeeService tbCfFeeService;
     @Autowired
     private TbCfCouponService tbCfCouponService;
+
     @Autowired
     private SpiderService spiderService;
 
@@ -100,6 +103,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     @Autowired
     private HttpServletRequest request; //自动注入request
 
+
     @Override
     public TbCfOrderEntity queryObject(String orderId) {
         return tbCfOrderDao.queryObject(orderId);
@@ -619,6 +623,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
      * @return
      */
     private TbCfOrderVo getGenericOrder(List<TbCfCartItemDetailVo> tbCfCartItemDetailList) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
+        TbCfFeeEntity feeEntity =  tbCfFeeService.getRateFee();
         TbCfOrderVo genericOrder = new TbCfOrderVo();
         genericOrder.setItemDetailList(tbCfCartItemDetailList);
         //初始商品总价
@@ -632,8 +637,12 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
             expressCost = expressCost.multiply(itemNum);
             totalExpressCost = totalExpressCost.add(expressCost);
         }
-        /*获取人民币汇率 1美元换取人民币  TODO 汇率接口出问题，暂设置为1  */
-        BigDecimal rate = new BigDecimal(1);//spiderService.getExchangeRate(null);
+
+        /*获取人民币汇率 1美元换取人民币
+         *TODO 汇率接口出问题，暂设置为1（暂时先不用爬虫爬区汇率，用后台手续费设置的汇率）
+         *暂时从后台获取人工设置的汇率
+         * */
+        BigDecimal rate = feeEntity.getFeeRate();//spiderService.getExchangeRate(null);
         itemsPrice = itemsPrice.divide(rate, 2, BigDecimal.ROUND_UP);
         //计算手续费
         BigDecimal fee = countFee(itemsPrice);

src/main/resources/mapper/TbCfFeeDao.xml

@@ -8,6 +8,7 @@
         <result property="feeType" column="fee_type"/>
         <result property="enableFlag" column="enable_flag"/>
         <result property="feePercent" column="fee_percent"/>
+        <result property="feeRate" column="fee_rate"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfFeeEntity">
@@ -15,7 +16,8 @@
 			`fee_id`,
 			`fee_type`,
 			`enable_flag`,
-			`fee_percent`
+			`fee_percent`,
+			`fee_rate`
 		from tb_cf_fee
 		where fee_id = #{id}
 	</select>
@@ -25,7 +27,8 @@
     		`fee_id`,
     		`fee_type`,
     		`enable_flag`,
-    		`fee_percent`
+    		`fee_percent`,
+    		`fee_rate`
 		from tb_cf_fee
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
@@ -57,12 +60,14 @@
 			`fee_id`,
 			`fee_type`,
 			`enable_flag`,
-			`fee_percent`)
+			`fee_percent`,
+			`fee_rate`)
 		values(
 			#{feeId},
 			#{feeType},
 			#{enableFlag},
-			#{feePercent})
+			#{feePercent},
+			#{feeRate})
 	</insert>
 	 
 	<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfFeeEntity">
@@ -70,7 +75,8 @@
 		<set>
 			<if test="feeType != null">`fee_type` = #{feeType}, </if>
 			<if test="enableFlag != null">`enable_flag` = #{enableFlag}, </if>
-			<if test="feePercent != null">`fee_percent` = #{feePercent}</if>
+			<if test="feePercent != null">`fee_percent` = #{feePercent}, </if>
+			<if test="feeRate != null">`fee_rate` = #{feeRate}</if>
 		</set>
 		where fee_id = #{feeId}
 	</update>
@@ -97,4 +103,16 @@
 		WHERE enable_flag=1
 	</select>
 
+	<!--获取当前生效的手人民币转成美元 理论上只有一个-->
+	<select id="getRateFee" resultMap="tbCfFeeMap">
+		select
+			`fee_id`,
+    		`fee_type`,
+    		`enable_flag`,
+    		`fee_percent`,
+    		`fee_rate`
+		from tb_cf_fee
+		WHERE enable_flag=1
+	</select>
+
 </mapper>
\ No newline at end of file