Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java

@@ -51,7 +51,6 @@ public class HighOrderController {
     private HighCouponCodeService highCouponCodeService;
 
 
-
     @RequestMapping(value = "/getOrderById", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "根据id查询订单详情")

hai-bweb/src/main/java/com/bweb/excelListener/ImportCouponListener.java

@@ -92,7 +92,11 @@ public class ImportCouponListener extends AnalysisEventListener<ImportCouponMode
     @Override
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
         if (successData.size() > 0) {
-            highCouponCodeService.insertList(successData);
+            try {
+                highCouponCodeService.insertList(successData);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         this.successData.clear();
         this.allCouponCode.clear();

hai-cweb/src/main/resources/dev/config.properties

@@ -10,7 +10,7 @@ wxSubAppId=wx8d49e2f83025229d
 wxSubMchId=1603942866
 wxUnifiedOrderUrl=https://api.mch.weixin.qq.com/pay/unifiedorder
 
-notifyUrl=https://hsgcs.dctpay.com//crest/wechatpay/notify
+notifyUrl=https://hsgcs.dctpay.com/crest/wechatpay/notify
 
 fileUrl=/home/project/hsg/filesystem
 cmsPath=/home/project/hsg/filesystem/cmsPath

hai-service/src/main/java/com/hai/service/HighCouponCodeService.java

@@ -27,7 +27,7 @@ public interface HighCouponCodeService {
      * @Description 批量增加
      * @Date 2021/3/18 21:30
      **/
-    void insertList(List<HighCouponCode> list);
+    void insertList(List<HighCouponCode> list) throws Exception;
 
     /**
      * @Author 胡锐

hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java

@@ -1,8 +1,10 @@
 package com.hai.service.impl;
 
+import com.hai.common.QRCodeGenerator;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
+import com.hai.common.utils.DateUtil;
 import com.hai.dao.HighCouponCodeMapper;
 import com.hai.dao.HighCouponCodeMapperExt;
 import com.hai.entity.HighChildOrder;
@@ -47,7 +49,14 @@ public class HighCouponCodeServiceImpl implements HighCouponCodeService {
     }
 
     @Override
-    public void insertList(List<HighCouponCode> list) {
+    public void insertList(List<HighCouponCode> list) throws Exception {
+        for (HighCouponCode highCouponCode: list) {
+            // 生成二维码
+            String qrCodeImg = DateUtil.date2String(new Date(),"yyyyMMddHHmmss")+".png";
+            String qrCodeUrl = "/home/project/hsg/filesystem/couponCode/" + qrCodeImg;
+            QRCodeGenerator.generateQRCodeImage(list.get(0).getSalesCode(), 350, 350, qrCodeUrl);
+            highCouponCode.setExt1(qrCodeImg);
+        }
         highCouponCodeMapperExt.insertList(list);
     }
 

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -77,11 +77,7 @@ public class HighOrderServiceImpl implements HighOrderService {
                 list.get(0).setStatus(99);  // 状态：1.待销售 2.未使用 3.已使用  99.预支付
                 highCouponCodeService.updateCouponCode(list.get(0));
 
-                // 生成二维码
+                childOrder.setExt1(list.get(0).getExt1());
-                //String qrCodeUrl = "/home/project/hsg/filesystem/couponCode/"+DateUtil.date2String(new Date(),"yyyyMMddHHmmss")+".png";
-                String qrCodeUrl = "F:\\"+DateUtil.date2String(new Date(),"yyyyMMddHHmmss")+".png";
-                QRCodeGenerator.generateQRCodeImage(list.get(0).getSalesCode(), 350, 350, qrCodeUrl);
-                childOrder.setExt1(qrCodeUrl);
                 highChildOrderMapper.updateByPrimaryKey(childOrder);
 
                 if(childOrder.getGiveawayType() == false) {