修复订单物流查询

src/main/java/com/diaoyun/zion/chinafrica/constant/EmailTemplateConstant.java

@@ -6,4 +6,6 @@ package com.diaoyun.zion.chinafrica.constant;
 public class EmailTemplateConstant {
     //注册
     public static String REGISTER="email-template.ftl";
+    //注册
+    public static String REGISTERS="email-templates.ftl";
 }

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

@@ -81,7 +81,7 @@ public class TbCfOrderController {
     }
 
     /**
-     * 根据订单号获取详细订单数据
+     * 根据订单号获取详细订单数据 
      */
     @ApiOperation(value = "根据订单号获取详细订单数据")
     @GetMapping(value = "/detail/{orderId}")

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

@@ -66,4 +66,6 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> {
     TbCfUserVo queryUserByUserId(String userId);
 
     List<TbCfUserInfoEntity> selectUserByPhone();
+
+    List<String> findEmails();
 }

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

@@ -179,4 +179,8 @@ public interface TbCfUserInfoService {
 
     Result queryUserByUserId(String userId);
     List<TbCfUserInfoEntity> selectUserByPhone();
+
+    List<String> findEmails();
+
+    String sendRegister(String email) throws EmailException, TemplateException, IOException;
 }

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

@@ -64,10 +64,10 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
     //退款API
     private String FLUTTERWAVE_REFUND_URL = "https://api.ravepay.co/gpx/merchant/transactions/refund";
 
-    //校验API
-    private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
+//    //校验API
+//    private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
     //测试API
-//    private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify";
+    private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify";
 
     /**
      * 使用卡号支付(预支付)
@@ -80,7 +80,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
     public Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard) {
         RaveConstant.PUBLIC_KEY = domainProperties.getProperty("flutterwave.public.key");
         RaveConstant.SECRET_KEY = domainProperties.getProperty("flutterwave.secret.key");
-        RaveConstant.ENVIRONMENT = Environment.LIVE; //or live
+        RaveConstant.ENVIRONMENT = Environment.STAGING; //or live
         Result result = new Result();
         TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId);
         TbCfOrderEntity orderEntity = tbCfOrderDao.queryObject(orderId);

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

@@ -579,6 +579,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     private void updateItemOrderRecord(String orderId, List<TbCfCartItemDetailVo> tbCfCartItemDetailList) {
         for (TbCfCartItemDetailVo tbCfCartItemDetailVo : tbCfCartItemDetailList) {
             TbCfItemOrderREntity tbCfItemOrderR = new TbCfItemOrderREntity();
+            tbCfItemOrderR.setOrderItemId(tbCfCartItemDetailVo.getOrdersId());
             tbCfItemOrderR.setEnableFlag(StateConstant.VALID);
             tbCfItemOrderR.setItemId(tbCfCartItemDetailVo.getItemId());
             tbCfItemOrderR.setOrderId(orderId);

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

@@ -555,6 +555,18 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
         return tbCfUserInfoDao.selectUserByPhone();
     }
 
+    @Override
+    public List<String> findEmails() {
+        return tbCfUserInfoDao.findEmails();
+    }
+
+    @Override
+    public String sendRegister(String email) throws EmailException, TemplateException, IOException {
+            emailHelper.sendEmail(email, EmailTemplateConstant.REGISTERS);
+             return "s";
+    }
+
+
     /**
      * 获取用户类型
      *

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

@@ -51,4 +51,21 @@ public class EmailHelper {
         //logger.info("邮件发送结果："+res);
         return emailTemplateBo.getIdentifyCode();
     }
+
+    public void sendEmail(String email, String templateName) throws IOException, TemplateException, EmailException {
+        Template t = configuration.getTemplate(templateName);
+        Map<String,Object> model = new HashMap<>();
+        String html = FreeMarkerTemplateUtils.processTemplateIntoString(t, model);
+        HtmlEmail emails = new HtmlEmail();//创建一个HtmlEmail实例对象
+        emails.setHostName(domainProperties.getProperty("email.hostName"));//邮箱的SMTP服务器，一般123邮箱的是smtp.123.com,qq邮箱为smtp.qq.com
+        emails.setCharset(Consts.UTF_8.name());//设置发送的字符类型
+        //email.addTo("zhengfanguang@163.com");//设置收件人
+        emails.addTo(email);//设置收件人
+        emails.setFrom(domainProperties.getProperty("email.from.email"), domainProperties.getProperty("email.from.name"));//发送人的邮箱为自己的，用户名可以随便填
+        emails.setAuthentication(domainProperties.getProperty("email.authentication.userName"), domainProperties.getProperty("email.authentication.password"));//设置发送人的邮箱和用户名和授权码(授权码是自己设置的)
+        emails.setSubject(domainProperties.getProperty("email.subject"));//设置发送主题
+        emails.setMsg(html);//设置发送内容
+        String res=emails.send();
+        logger.info("邮件发送结果："+res);
+    }
 }

src/main/resources/mapper/TbCfItemOrderRDao.xml

@@ -110,6 +110,21 @@
 		</set>
 		where order_item_id = #{orderItemId}
 	</update>
+	<update id="updates" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
+		update tb_cf_item_order_r
+		<set>
+			<if test="itemId != null">`item_id` = #{itemId}, </if>
+			<if test="orderId != null">`order_id` = #{orderId}, </if>
+			<if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
+			<if test="orderStatus != null">`order_status` = #{orderStatus},</if>
+			<if test="deliveryFlag != null">`delivery_flag` = #{deliveryFlag},</if>
+			<if test="deliveryTime != null">`delivery_time` = #{deliveryTime},</if>
+			<if test="closeTime != null">`close_time` = #{closeTime},</if>
+			<if test="isSend != null">`is_send` = #{isSend},</if>
+			<if test="updateTime != null">`update_time` = #{updateTime}</if>
+		</set>
+		where order_id = #{orderId}
+	</update>
 
 	<select id="getItemNum" resultType="int">
 		select t2.item_num from tb_cf_item_order_r t1 left join tb_cf_item_detail t2 on t1.item_id=t2.item_id where t1.order_item_id=#{ordersId}

src/main/resources/mapper/TbCfOrderDao.xml

@@ -289,17 +289,14 @@
     </select>
 	<!--根据订单id，获取订单内商品详情-->
 	<select id="getOrderItemList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
-			SELECT
-		t1.*,
-		t5.template_title descripitionName
+		SELECT
+		t1.*
 		FROM
 		tb_cf_item_detail t1
 		LEFT JOIN tb_cf_item_order_r t2 ON t1.item_id = t2.item_id
-		LEFT JOIN tb_cf_order t3 ON t2.order_id = t3.order_id
-		LEFT JOIN tb_cf_platform_order t4 on  t3.order_id=t4.order_id
-		LEFT JOIN tb_cf_express_template t5 on t5.template_id=t4.descripition_id
+		LEFT JOIN tb_cf_order  t3 on t2.order_id=t3.order_id
 		WHERE
-		t2.enable_flag = 1 and t3.order_id=#{order_id}
+		t2.enable_flag=1 and t2.order_id=#{order_id}
     </select>
 	<!--根据订单id，获取订单内商品详情-->
 	<select id="getItemList" resultType="com.diaoyun.zion.chinafrica.entity.ItemEntity">

src/main/resources/mapper/TbCfUserInfoDao.xml

@@ -194,7 +194,9 @@
             #{userId}
         </foreach>
     </delete>
-
+    <select id="findEmails" resultType="String">
+		 select account from tb_cf_user_info where  account  LIKE concat('%@%')
+    </select>
     <!--根据nickname获取用户信息-->
     <select id="getByNickname" resultType="com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity">
         select * from tb_cf_user_info where nickname=#{nickname}

src/main/resources/templates/email-templates.ftl

+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>Afrishop Verification</title>
+</head>
+
+<body>
+    <section style="width: 600px;height :720px;margin:0 auto;box-sizing: border-box;position: relative;">
+        <img style="position:absolute;width: 600px;height :720px;top:0;left:0;" src="https://diaopaas.com/wk_vote_node/public/africa-show.jpg" alt="背景图">
+    </section>
+</body>
+</html>

src/test/java/com/diaoyun/zion/ZionApplicationTests.java

@@ -13,6 +13,8 @@ import com.diaoyun.zion.master.util.IdUtil;
 import com.diaoyun.zion.master.util.SMSUtil;
 import com.stripe.exception.StripeException;
 import freemarker.template.Configuration;
+import freemarker.template.TemplateException;
+import org.apache.commons.mail.EmailException;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.CookieStore;
 import org.apache.http.message.BasicNameValuePair;
@@ -510,8 +512,14 @@ public class ZionApplicationTests {
             System.out.println(it.next());
         }
     }
-
-
+  /*  @Test
+    public void sendEmail() throws EmailException, TemplateException, IOException {
+      *//* List<String> emailList= tbCfUserInfoService.findEmails();
+       for (String email:emailList){
+       }*//*
+        String email="1203063316@qq.com";
+        tbCfUserInfoService.sendRegister(email);
+    }*/
     @Test
     public void sendMessageToAll() {
         String phone = "";