Merge branch 'master' of E:\Git\zion with conflicts.

src/main/java/com/diaoyun/zion/chinafrica/api/Test.java

+package com.diaoyun.zion.chinafrica.api;
+
+public class Test {
+
+
+}

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

@@ -21,4 +21,11 @@ public interface TbCfToiCouponDao extends BaseDao<TbCfToiCouponEntity> {
     List<TbCfToiCouponEntityExtends> queryCouponByUserId(String userId);
 
     int changeCoupnStatus(String userId, String couponId);
+    /**
+     * 更改使用状态
+     * @param userId
+     * @param couponId
+     * @return
+     */
+    int updateEnableFlag(String userId, String couponId, Integer invalid);
 }

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

@@ -4,6 +4,7 @@ import com.diaoyun.zion.chinafrica.constant.KeyConstant;
 import com.diaoyun.zion.chinafrica.dao.TbCfFinanceDao;
 import com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao;
 import com.diaoyun.zion.chinafrica.dao.TbCfOrderDao;
+import com.diaoyun.zion.chinafrica.dao.TbCfToiCouponDao;
 import com.diaoyun.zion.chinafrica.entity.TbCfFinanceEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity;
 import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum;
@@ -29,6 +30,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.Date;
@@ -50,6 +52,8 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
     @Autowired
     private TbCfIssueCouponDao tbCfIssueCouponDao;
     @Autowired
+    private TbCfToiCouponDao TbCfToiCouponDao;
+    @Autowired
     private DomainProperties domainProperties;
     @Resource
     private RedisCache<Object> orderRedisCache;
@@ -107,7 +111,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
                     changeOrderState(paymentId, tbCfOrderVo);
                     //修改优惠券状态
                     if (tbCfOrderVo.getCouponId() != null && tbCfOrderVo.getPayStatus() == 20) {
-                        tbCfIssueCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
+                        TbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
                     }
                     //生成支付流水
                     TbCfFinanceEntity finance = createFinance(paymentId, url, tbCfOrderVo);

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

@@ -4,6 +4,7 @@ import com.diaoyun.zion.chinafrica.constant.KeyConstant;
 import com.diaoyun.zion.chinafrica.dao.TbCfFinanceDao;
 import com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao;
 import com.diaoyun.zion.chinafrica.dao.TbCfOrderDao;
+import com.diaoyun.zion.chinafrica.dao.TbCfToiCouponDao;
 import com.diaoyun.zion.chinafrica.entity.TbCfFinanceEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity;
 import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum;
@@ -19,14 +20,11 @@ import com.diaoyun.zion.master.enums.ResultCodeEnum;
 import com.diaoyun.zion.master.util.IdUtil;
 import com.diaoyun.zion.master.util.JsoupUtil;
 import com.egzosn.pay.common.api.PayService;
-import com.egzosn.pay.common.bean.MethodType;
 import com.egzosn.pay.common.bean.PayOrder;
 import com.egzosn.pay.common.bean.RefundOrder;
-import com.egzosn.pay.common.http.HttpConfigStorage;
 import com.egzosn.pay.paypal.api.PayPalConfigStorage;
 import com.egzosn.pay.paypal.api.PayPalPayService;
 import com.egzosn.pay.paypal.bean.PayPalTransactionType;
-import com.stripe.model.Charge;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,6 +55,8 @@ public class PayPalServiceImpl implements PayPalService {
     private TbCfOrderDao tbCfOrderDao;
     @Autowired
     private TbCfIssueCouponDao tbCfIssueCouponDao;
+    @Autowired
+    private TbCfToiCouponDao tbCfToiCouponDao;
 
     private String ORDER_ID = "";
 
@@ -140,7 +140,7 @@ public class PayPalServiceImpl implements PayPalService {
                     changeOrderState(paymentId, tbCfOrderVo);
                     //修改优惠券状态
                     if (tbCfOrderVo.getCouponId() != null && tbCfOrderVo.getPayStatus() == 20) {
-                        tbCfIssueCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
+                        tbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
                     }
                     //生成支付流水
                     TbCfFinanceEntity finance = createFinance(paymentId, token, payerID, tbCfOrderVo);

src/main/java/com/diaoyun/zion/master/thread/AbstractTencentCallable.java

@@ -4,7 +4,6 @@ import com.diaoyun.zion.master.util.HttpClientUtil;
 import com.diaoyun.zion.master.util.SortUtil;
 import net.sf.json.JSONObject;
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.http.Consts;
 
 import java.util.Map;
 import java.util.SortedMap;
@@ -36,6 +35,5 @@ public abstract class AbstractTencentCallable<T> implements Callable<Map<String,
         Map<String, Object> resultMap = JSONObject.fromObject(resultStr);
         return resultMap;
     }
-
     abstract void fillParam(T param);
 }

src/main/java/com/diaoyun/zion/master/thread/TranslateCallable.java

@@ -3,19 +3,11 @@ package com.diaoyun.zion.master.thread;
 import com.diaoyun.zion.master.bo.TencentTranslateParam;
 import com.diaoyun.zion.master.config.DomainProperties;
 import com.diaoyun.zion.master.enums.TranslateLanguageEnum;
-import com.diaoyun.zion.master.util.HttpClientUtil;
 import com.diaoyun.zion.master.util.IdUtil;
-import com.diaoyun.zion.master.util.SortUtil;
 import com.diaoyun.zion.master.util.SpringContextUtil;
-import net.sf.json.JSONObject;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.http.Consts;
-import org.apache.http.protocol.HTTP;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.util.*;
-import java.util.concurrent.Callable;
+import java.util.Map;
 
 /** 腾讯翻译类
  * https://api.ai.qq.com/fcgi-bin/nlp/nlp_texttranslate
@@ -32,7 +24,6 @@ public class TranslateCallable extends AbstractTencentCallable<TencentTranslateP
         this.charset=Consts.UTF_8.name();
     }
     // TODO 泛型
-
     @Override
     public Map<String, Object> call() throws Exception {
         //填充参数

src/main/java/com/diaoyun/zion/master/util/TranslateHelper.java

@@ -44,7 +44,6 @@ public class TranslateHelper {
             logger.error(e.getMessage(),e);
         }
     }
-
      /**
      * 等待翻译结果
      * @param futureList
@@ -88,10 +87,8 @@ public class TranslateHelper {
                 } else {
                     productPropMap.put("translate",(String) productPropMap.get("propName"));
                 }
-
             }
             translateArray.add(keyTranslateMap);
-
         }
         // TODO productPropSetMap.put("translateArray",translateArray);
     }

src/main/resources/mapper/TbCfToiCouponDao.xml

@@ -77,10 +77,14 @@
             WHERE a.user_id = #{userId} and a.enable_flag=1 and b.status=1
 
     </select>
+	<!--修改优惠券为已使用-->
 	<update id="changeCoupnStatus" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
       update  tb_cf_toicoupon t set  enable_flag = 0  where  t.user_id=#{userId} and  t.coupon_id=#{couponId}
     </update>
-
+	<!--修改优惠券领取发放记录-->
+	<update id="updateEnableFlag">
+        update tb_cf_toicoupon set enable_flag=#{enableFlag} where user_id=#{userId} and coupon_id=#{couponId}
+	</update>
 	<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
 		insert into tb_cf_toicoupon(
 			`toitable_id`,