提交

1.微信支付
2.小功能修改

b2b2c/b2b2c-config-starter/mq-slodon-starter/src/main/java/com/slodon/b2b2c/starter/mq/entity/MessageSendVO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @program: slodon
@@ -42,11 +43,24 @@ public class MessageSendVO implements Serializable {
     /**
      *  TODO 20220309 为保证项目运行生成方法 此处原来缺失报错
      */
-    public MessageSendVO(List<MessageSendProperty> messageSendPropertyList, List<MessageSendProperty> messageSendPropertyList4Wx, Object o, Integer memberId, String afterSaleReminder, String msgLinkInfo) {
+    public MessageSendVO(List<MessageSendProperty> templateParamList,  List<MessageSendProperty> propertyList,Object o, Integer receiveId, String tplType, String msgLinkInfo) {
+        this.receiveId = receiveId;
+        this.tplType = tplType;
+        this.msgLinkInfo = msgLinkInfo;
+        this.templateParam = templateParamList.stream().map(m-> m.getPropertyValue()).toArray(String[]::new);
+        this.propertyList = propertyList;
     }
     /**
      *  TODO 20220309 为保证项目运行生成方法 此处原来缺失报错
      */
-    public MessageSendVO(List<MessageSendProperty> messageSendPropertyList, Integer receiveId, Long storeId, String newOrderReminder, String msgLinkInfo) {
+    public MessageSendVO(List<MessageSendProperty> templateParamList, Integer receiveId, Long storeId, String tplType, String msgLinkInfo) {
+        if(null == receiveId || "".equals(receiveId) ){
+            this.receiveId = storeId;
+        }else{
+            this.receiveId = receiveId;
+        }
+        this.tplType = tplType;
+        this.msgLinkInfo = msgLinkInfo;
+        this.templateParam = templateParamList.stream().map(m-> m.getPropertyValue()).toArray(String[]::new);
     }
 }

b2b2c/b2b2c-config-starter/pay-slodon-starter/src/main/resources/wx_cert/apiclient_cert.pem

@@ -1,23 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID7DCCAtSgAwIBAgIUSMJ8uNSl3l5fQmFtIBM2oRypedQwDQYJKoZIhvcNAQEL
+MIID8zCCAtugAwIBAgIUINijgdgIN2dSPxI7BAB2Zgwtb4gwDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjAxMTE4MDIyMzU3WhcNMjUxMTE3MDIyMzU3WjB+MRMwEQYDVQQDDAox
-NDg0ODcyMDYyMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xKjAoBgNVBAsM
-IeWMl+S6rOWVhuiBlOi+vuenkeaKgOaciemZkOWFrOWPuDELMAkGA1UEBgwCQ04x
-ETAPBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArIg2x9+MoUJwrR5IK3jvxK2jXrtWfNCwmVT7hq8Aua885gS2PZ9PiOX+B64H
-aH2U95hLRWU8O/D9eQAiLoh9hcSq2HM6GYIchB1Kwjb6fWrOSw9ppQWSI/PMCA3v
-0Z7l6a3CQWQrf2pjfDahBMata0QevrKx/6CDCXtt5t6rrJMjCOW/TBDsYkl+lkmy
-PNFGKmXBkAdM8XF8CMdFBTMPSFdfHvN99vd0rgWVfcrE4qwAEQApCJpBJXxKUMvu
-ypP8/d186IUpuHQxVnyjz2drL/PPykEFawAR9I+lSBLpLUqFf3OFCuEtAt0Clszl
-G17IsGG0rdqTaLa8B6ZM4iVzLQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNu
-L3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0
-NkMwMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBkWgmkYclV4aijGhHrPkNg
-Nyj7HE1sdpC9fsUqKMivKYd5DO9OFHfvcasuoYpIbJgc1507mAQuQkBzsndrHKRc
-/OosybXPntpgWwaHBq1xFrLeUISsDrXeQbtmXubRyfyVogkiVCysdWcIegKc/BFp
-wFzHBZRrTiZ75bdemJw3Xlw+TnlwKQKYYB8FNXsOGU+1fRiBoGwI8mb3Zbpupl6j
-Slfxs5dH+A2yNxl0j2HzSszB2calrQQEvGD0dw5XODmq/e1auIN0alHNRb5K7O7G
-8/9k8LniA2UAQeWKHyoCaiiY0XLbijxv+riUwiegKgdO/fRMFn6ZStNc7nUj/bqQ
+Q0EwHhcNMjIwNTE3MDI0MzA1WhcNMjcwNTE2MDI0MzA1WjCBhDETMBEGA1UEAwwK
+MTQ4OTg3MTQwMjEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTAwLgYDVQQL
+DCflsbHopb/kupHlvpfniannvZHnu5znp5HmioDmnInpmZDlhazlj7gxCzAJBgNV
+BAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKWHyjcjtxj+6k2TMwrIq71sfmZPrqJmTqivFQ3QOQ5tXeqhvdy3
+ElhSQ2qmJwO5ouR0INWxhkxqcjGTVuW3UazFMQwnrg9Q3f7ZOuyCYo2m//83JezQ
+SAAlv1FhWQAMhjb46lZAVhOYeddq+8dN262MEx1OxPEI7w/8WxF7YVkE7TpMGd9U
+/jthyb7VnFZH2j9dKE6IXcs8psMhPkDATsQifRaDr63hwXZ33PexFWh/Pwwc8zs7
+nDSD0DOgh80KGTxE1vpvGLJX2DmfZm7eOu8ePjePrvE7FQxpsX6O/rzDilcK5OHn
++AxNidm4rUeTuF+MwxPQbENERvi8tGNhskkCAwEAAaOBgTB/MAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVz
+LmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQz
+OTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAc/Boyxf2gtmN
+eG6TjmilNTWoxY5KwKyAMTCanhwSYOFK70vl+zZcy1jlEFAaU84E3HUqcMmlmpl1
+STlq/Ej2hTe9p0/v0VtQuorSJKb7PLU6sfx3nN7IUwWJT2WDncN+ftHPwGxDbDm2
+o+dFTq2/EZnh7lRQHwQFS/wpczo2yuQoCkaFga4RAqIaEK+95pa/ztiAD3dzcgbt
+ZQTfBEE+pXc4MbN2WOa9RAwHp+XkIFZCwG2iphEjq3g/WsfEO3eDMSkNwuia93XF
+zsVamQj10HRIWwJCUlzcBU0xY+B083rwViZjDnGCFvwPhxrcgU9jwr9HwzyWmkfI
+jaaOsRrZMg==
 -----END CERTIFICATE-----

b2b2c/b2b2c-config-starter/pay-slodon-starter/src/main/resources/wx_cert/apiclient_key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCsiDbH34yhQnCt
-HkgreO/EraNeu1Z80LCZVPuGrwC5rzzmBLY9n0+I5f4HrgdofZT3mEtFZTw78P15
-ACIuiH2FxKrYczoZghyEHUrCNvp9as5LD2mlBZIj88wIDe/RnuXprcJBZCt/amN8
-NqEExq1rRB6+srH/oIMJe23m3quskyMI5b9MEOxiSX6WSbI80UYqZcGQB0zxcXwI
-x0UFMw9IV18e833293SuBZV9ysTirAARACkImkElfEpQy+7Kk/z93XzohSm4dDFW
-fKPPZ2sv88/KQQVrABH0j6VIEuktSoV/c4UK4S0C3QKWzOUbXsiwYbSt2pNotrwH
-pkziJXMtAgMBAAECggEAZufDzMkgRtqq/AawwwUZ9XQfmhQgzMdoXbwbXcSpqRbF
-OuiajfykYqHTN19sWb11iYwTcSullpbxiCc1PA362DtqLzni8G3zdjVGbrp+Ayoe
-KxThTSUaekkia7dsT9n3hb42u+v0KcYZ2m928LNTokP6FoHcuvxQy+oLrgUn3gDV
-OqeKXIWi+3Gvs1UEh2GvzYsZ/oi6gfZzopeU4K8AvqeHd8Dksvi3ivTehVxrn1/L
-ciTQ0G2QWerbJpGRQuP1+n3fZMIbcVVmMNi5/qs/vQGM2EVdA6r/GD177ufpln7r
-aOlLhUfv6Oib8DAld8oo3Ol1Ifz8BJ0Gphmly32bvQKBgQDhL6RtorsGd/3P16lT
-ADnSfbQy8Dsve7tq70WsUo1ZxzltB2XrYTihgzMME2BvOMJPa/+NFdmy4ro0E17g
-CcW9iM9fKIqnnXExb7e17V+5TPGtxYrhs8WkSqukPBeVsneM5oqiu5eOT5uheWcL
-OILTFssBIndlwxc+Otqe/KzeCwKBgQDEJBSuCXNzfo7AZqqkWpeFzsT8Je0GObVF
-OwsFWmlKTAIQqwz/IAB/F2G+e2QjpIHO97C5C2hC7DQAoammy53qfEr9yt3UAaKA
-OwZS15bPmT5IBI2NcfOAp5aNeKV4Tz/OO166Cq6iA92VlNqa7fZk4E+Yy3hbtbbI
-+Gro3TQOpwKBgQDSYx6ux/EQtB7Qht9OCtH7FTK8vLGvRVzvJankvCQQExBWCylv
-5p9wVxHkYF4iy9bPOUnDWPzSIv5xFP/5NWgoEqAcedZBj9lnpMbxFFvw1jCeeAev
-o7QuMQ14HiSy2dDUNbilHbsVXM886B4b36pq6cq0vqzqyID4xSfojo47zQKBgGp/
-8N6i8RY4FMjxthwxuG6GXD1RVob31K53pb9NXThjVwe36QGqXbqkdoVYOIKF85nu
-sf137S/RU1c4cIbJrsBApvNxMMvJ63NXGVLoDtJAMiomlrnDsuUbmkrMxIQz+8A+
-SmwYGsSL9sgeoChZp10U0wNzD7I0U8CB6oLwgTCnAoGAE+KDzMbl4+nqPcFQgVX1
-Q2fFesaFwMD1uV5ukpLCVeyDpL/reToIFPxT2wYUciMgvke7/aaD2Z17N4Vh4kIR
-b70id8Ae4xrSpRrtXeLgCIY10m+9AMAXjKhu1TLnI8To0dF/UgoGyTxQh6eggXaD
-ixJvcFG9KDJEguwiviOH2CA=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQClh8o3I7cY/upN
+kzMKyKu9bH5mT66iZk6orxUN0DkObV3qob3ctxJYUkNqpicDuaLkdCDVsYZManIx
+k1blt1GsxTEMJ64PUN3+2TrsgmKNpv//NyXs0EgAJb9RYVkADIY2+OpWQFYTmHnX
+avvHTdutjBMdTsTxCO8P/FsRe2FZBO06TBnfVP47Ycm+1ZxWR9o/XShOiF3LPKbD
+IT5AwE7EIn0Wg6+t4cF2d9z3sRVofz8MHPM7O5w0g9AzoIfNChk8RNb6bxiyV9g5
+n2Zu3jrvHj43j67xOxUMabF+jv68w4pXCuTh5/gMTYnZuK1Hk7hfjMMT0GxDREb4
+vLRjYbJJAgMBAAECggEAJVfiDdh32SLBNykLLdahsAVG6sv1KNwNyM5e4JPmG1Qf
+COzeSWnfsJ82aFv9l0CM+B8evTbkhl7JTlfgFcjqmyCNdSGKihgDTRgyy+KKW0ye
+mjQV0TwX0jix1akxi+pHaSV0sGqpQJh4fFm9XXQ6KAfe1BDOK1aJoECdRu9fwdYW
+ykTJsXQcZdH9YCSwpGGyM7qPzhMFCGXbiKplEaoqc494FxhazzAJbWiTb6/NeXJ9
+XbPQWFSWlfBtC0ogh6T9OY8ldl2Y279cH4/9yTFDXV8rAmsE7QBajCC1o9GnmQIy
+1P/WQSYKaUN+PyrIa3XF+PwoZDhm+o2TCexZF9tmlQKBgQDS0QalqpF/WzKmCRQo
+z98OCc+THJaBmo8k1ARiZmimNVa8f72P6WGVvEzkNAdeV4lPPpQIP2WZ7I2M22F0
+8if99xMUOylecxm2tGNxw/mhxMo4yIOua8nMD3oXVJkngNivUnqDkMN3V9Qx9139
+B3KJ1xqVL0Bsqwy7YEjfq8L4XwKBgQDJAge6J2ZlcP+xhCoxRvY/+AmZjCQN0xfJ
+igenF/HPfH7Yho882N2XUF/Ec5y+VYugdoHetHuOv1AgnbXol+rwec7J6BmJQeNZ
+99tDe0a6rQdcnwacdVopCKdVhMn1LWBfyN49mMBuOYpNkge5Dz8YJiopCcIjhg+6
+bG5yGwz2VwKBgQDBpGp8pa4702M0i8ZOrpHubSiTsoC0z2mIpI7aa8LYWMoxHwza
+Mb8HMQ1X2EqkZ7eiaJLE+Ka0ukpTBfgA2aXOa7LEtIsNTKBj6FIn36Fe7Enr2pLK
+FgwoOlclMvnzBTED6bjLPJ+u8afhtZxJnRuibUjnm52Ls5pgStLlUPon9QKBgChn
+5hG/lc/SdTPD849QSnP1ckiRaTX2NxPmUT9/irZAumbgNa7vkSu3lmixLNL980Fg
+UR7pfOTnBD5qNYT59No+QhlINMnomsEdF9Bq2X7xBUfTF8sfs+4HtUt1k/tbEcJv
+aG1NZXFC09BgCHlk3TQHh/YT5hip/ENnRJRfZ62lAoGAQs73XsLdYwegyNPcHOPs
+s4G9jj90e+aJKCtAGUThVJE5yZSVYT2k2eGT8CNasUF+4b93SSDQmirE/c7pqzdX
+V3mM6EmzWSNQG8cJI91r84JCuewfc4oOz+V7oCoX9b/gyV7DOPK88Dzf7JD8jZFm
+3La5ftfKjk7W9C7J5HB1S9A=
 -----END PRIVATE KEY-----

b2b2c/b2b2c-entity/src/main/java/com/slodon/b2b2c/video/pojo/VideoSetting.java

@@ -0,0 +1,25 @@
+package com.slodon.b2b2c.video.pojo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class VideoSetting implements Serializable {
+
+    @ApiModelProperty("配置名称")
+    private String name;
+
+    @ApiModelProperty("配置主题，前端展示使用")
+    private String title;
+
+    @ApiModelProperty("配置值")
+    private String value;
+
+    @ApiModelProperty("配置描述")
+    private String description;
+
+    @ApiModelProperty("类型，1-字符串，2-图片，3-固定不能修改，4-开关")
+    private Integer type;
+}

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/front/FrontDecoController.java

@@ -52,12 +52,13 @@ public class FrontDecoController {
 
     @ApiOperation("移动端首页数据")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "装修页类型", paramType = "query"),
             @ApiImplicitParam(name = "os", value = "当前设备标识 可选值：android，ios，h5，weixinXcx，alipayXcx", paramType = "query"),
             @ApiImplicitParam(name = "homeId", value = "首页id（预览时必传）", paramType = "query"),
             @ApiImplicitParam(name = "preview", value = "预览标识", paramType = "query")
     })
     @GetMapping("index")
-    public JsonResult indexPage(String os, String homeId, String preview) {
+    public JsonResult indexPage(String type,String os, String homeId, String preview) {
         TplMobileDecoExample tplMobileDecoExample = new TplMobileDecoExample();
 
         if (!StringUtils.isEmpty(preview)) {
@@ -91,6 +92,10 @@ public class FrontDecoController {
             tplMobileDecoExample.setType("home");
         }
 
+        if(!StringUtil.isEmpty(type)){
+            tplMobileDecoExample.setType(type);
+        }
+
         List<TplMobileDeco> list = tplMobileDecoModel.getTplMobileDecoList(tplMobileDecoExample, null);
 
         ModelMap modelMap = new ModelMap();

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/video/admin/AdminVideoSettingController.java

@@ -0,0 +1,42 @@
+package com.slodon.b2b2c.controller.video.admin;
+
+
+import com.slodon.b2b2c.core.controller.BaseController;
+import com.slodon.b2b2c.core.response.JsonResult;
+import com.slodon.b2b2c.core.response.SldResponse;
+import com.slodon.b2b2c.core.util.AssertUtil;
+import com.slodon.b2b2c.model.system.BillModel;
+import com.slodon.b2b2c.model.video.AdminVideoSettingModel;
+import com.slodon.b2b2c.video.pojo.VideoSetting;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "admin-直播管理")
+@RestController
+@Slf4j
+@RequestMapping("v3/video/admin/video/setting")
+public class AdminVideoSettingController extends BaseController {
+
+    @Resource
+    private AdminVideoSettingModel adminVideoSettingModel;
+    @Resource
+    private BillModel billModel;
+
+    @ApiOperation("直播设置列表")
+    @GetMapping("getLiveSettingList")
+    public JsonResult<List<VideoSetting>> getLiveSettingList() {
+        billModel.billJobSchedule();
+
+//        List<VideoSetting> list = adminVideoSettingModel.getLiveSettingList();
+//        AssertUtil.notNull(list, "请输入正确的参数");
+        return SldResponse.success();
+    }
+
+}

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/dao/read/video/VideoSettingReadMapper.java

@@ -0,0 +1,8 @@
+package com.slodon.b2b2c.dao.read.video;
+
+import com.slodon.b2b2c.core.database.BaseReadMapper;
+import com.slodon.b2b2c.video.example.VideoSettingExample;
+import com.slodon.b2b2c.video.pojo.VideoSetting;
+
+public interface VideoSettingReadMapper extends BaseReadMapper<VideoSetting, VideoSettingExample> {
+}

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/model/business/OrderPayModel.java

@@ -496,6 +496,7 @@ public class OrderPayModel {
         //消息通知
         List<MessageSendProperty> messageSendPropertyList = new ArrayList<>();
         messageSendPropertyList.add(new MessageSendProperty("orderSn", orderSn));
+        messageSendPropertyList.add(new MessageSendProperty("paymentTime", TimeUtil.getDateTimeString(new Date())));
         //微信消息通知
         List<MessageSendProperty> messageSendPropertyList4Wx = new ArrayList<>();
         messageSendPropertyList4Wx.add(new MessageSendProperty("first", "您的订单已付款成功。"));
@@ -519,6 +520,7 @@ public class OrderPayModel {
     public void sendMsgAccountChange(Member member, BigDecimal changeAmount) {
         //消息通知
         List<MessageSendProperty> messageSendPropertyList = new ArrayList<>();
+        messageSendPropertyList.add(new MessageSendProperty("changeTime", TimeUtil.getDateTimeString(new Date())));
         messageSendPropertyList.add(new MessageSendProperty("description", "下单支付"));
         messageSendPropertyList.add(new MessageSendProperty("availableBalance", member.getBalanceAvailable().toString()));
         messageSendPropertyList.add(new MessageSendProperty("frozenBalance", member.getBalanceFrozen().toString()));

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/model/promotion/SignActivityModel.java

@@ -232,6 +232,10 @@ public class SignActivityModel {
         signActivityExample.setEndTimeAfter(new Date());
         signActivityExample.setState(SignConst.SIGN_STATE_1);
         List<SignActivity> signActivityList = getSignActivityList(signActivityExample, null);
+        //TODO 暂时改为为空直接返回
+        if(CollectionUtils.isEmpty(signActivityList)){
+            return vo;
+        }
         AssertUtil.isTrue(CollectionUtils.isEmpty(signActivityList), "签到活动不可用");
         //不为空 正在进行的签到活动
         SignActivity signActivity = signActivityList.get(0);

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/model/video/AdminVideoSettingModel.java

@@ -0,0 +1,27 @@
+package com.slodon.b2b2c.model.video;
+
+import com.slodon.b2b2c.dao.read.video.VideoSettingReadMapper;
+import com.slodon.b2b2c.dao.write.video.VideoSettingWriteMapper;
+import com.slodon.b2b2c.video.example.VideoSettingExample;
+import com.slodon.b2b2c.video.pojo.VideoSetting;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Component
+@Slf4j
+public class AdminVideoSettingModel {
+
+    @Resource
+    private VideoSettingWriteMapper videoSettingWriteMapper;
+    @Resource
+    private VideoSettingReadMapper videoSettingReadMapper;
+
+    public List<VideoSetting> getLiveSettingList() {
+        List<VideoSetting> videoSettings = videoSettingReadMapper.listByExample(new VideoSettingExample());
+        return videoSettings;
+    }
+
+}

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/mq/MqSendMsgConsumer.java

@@ -76,6 +76,7 @@ public class MqSendMsgConsumer {
      */
     @RabbitListener(queues = StarterConfigConst.MQ_QUEUE_NAME_MEMBER_MSG, containerFactory = StarterConfigConst.MQ_FACTORY_NAME_SINGLE_PASS_ERR)
     public void memberMsgConsumer(MessageSendVO messageSendVO) {
+        log.info("发送会员消息,参数:" + JSON.toJSONString(messageSendVO));
         try {
             //网站名称
             String siteName = stringRedisTemplate.opsForValue().get("basic_site_name");
@@ -104,8 +105,8 @@ public class MqSendMsgConsumer {
             //定义参数值
             String[] templateArray = messageSendVO.getTemplateParam();
             if (memberSetting.getIsReceive().equals(MsgConst.IS_OPEN_SWITCH_YES)) {
-                /**----------------------------------------发邮件-----------------------------------------**/
                 if (memberTpl.getEmailSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES) && !StringUtil.isEmpty(member.getMemberEmail())) {
+                    log.info("/**----------------------------------------发邮件-----------------------------------------**/");
                     JSONObject jsonObjectForEmail = JSONObject.parseObject(memberTpl.getEmailContent());
                     String subject = jsonObjectForEmail.getString("email_subject");
                     String content = jsonObjectForEmail.getString("email_content");
@@ -124,48 +125,50 @@ public class MqSendMsgConsumer {
                     }
                     //发邮件
                     msgSendModel.sendMail(member.getMemberEmail(), subject, content);
+                    log.info("/**----------------------------------------发邮件结束-----------------------------------------**/");
                 }
-                /**----------------------------------------发邮件结束-----------------------------------------**/
 
-                /**----------------------------------------发短信--------------------------------------------**/
                 if (memberTpl.getSmsSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES) && !StringUtil.isEmpty(member.getMemberMobile())) {
-                    JSONObject jsonObject = JSONObject.parseObject(memberTpl.getSmsContent());
-                    String templateContent = jsonObject.getString("templateContent");
-                    SmsRequest smsRequest = new SmsRequest();
-                    smsRequest.setSmsType(SMSConst.NOTIFICATION_SMS);
-                    smsRequest.setMobile(member.getMemberMobile());
-                    if (DomainUrlUtil.SEND_SMS_TYPE == 1) {
-                        String templateId = jsonObject.getString("templateId");
-                        smsRequest.setTemplateId(templateId);
-                        smsRequest.setTemplateParam(templateArray);
-                    } else {
-                        //云片短信签名
-                        String smsSign = stringRedisTemplate.opsForValue().get("notification_sms_signature");
-                        //模板参数替换值
-                        String[] signParam = {smsSign};
-                        String[] templateParam = (String[]) ArrayUtils.addAll(signParam, templateArray);
+                    if (memberTpl.getSmsContent().contains("templateId") || memberTpl.getSmsContent().contains("templateContent")) {
+                        log.info("/**----------------------------------------发短信--------------------------------------------**/");
+                        JSONObject jsonObject = JSONObject.parseObject(memberTpl.getSmsContent());
+                        SmsRequest smsRequest = new SmsRequest();
+                        smsRequest.setSmsType(SMSConst.NOTIFICATION_SMS);
+                        smsRequest.setMobile(member.getMemberMobile());
+                        if (DomainUrlUtil.SEND_SMS_TYPE == 1) {
+                            String templateId = jsonObject.getString("templateId");
+                            smsRequest.setTemplateId(templateId);
+                            smsRequest.setTemplateParam(templateArray);
+                        } else {
+                            String templateContent = jsonObject.getString("templateContent");
+                            //云片短信签名
+                            String smsSign = stringRedisTemplate.opsForValue().get("notification_sms_signature");
+                            //模板参数替换值
+                            String[] signParam = {smsSign};
+                            String[] templateParam = (String[]) ArrayUtils.addAll(signParam, templateArray);
 
-                        Matcher matcher = pattern.matcher(templateContent);
-                        int i = 0;
-                        while (matcher.find()) {
-                            templateContent = templateContent.replace(matcher.group(), templateParam[i++]);
+                            Matcher matcher = pattern.matcher(templateContent);
+                            int i = 0;
+                            while (matcher.find()) {
+                                templateContent = templateContent.replace(matcher.group(), templateParam[i++]);
+                            }
+                            smsRequest.setTemplateContent(templateContent);
                         }
-                        smsRequest.setTemplateContent(templateContent);
+                        log.info("发短信參數" + JSON.toJSONString(smsRequest));
+                        msgSendModel.sendSMS(smsRequest);
+                        log.info("/**----------------------------------------发短信结束-------------------------------------------**/");
                     }
-                    //发短信
-                    msgSendModel.sendSMS(smsRequest);
                 }
 
-                /**----------------------------------------发短信结束-------------------------------------------**/
-
-                /**----------------------------------------发站内信开始-----------------------------------------**/
                 if (memberTpl.getMsgSwitch() == MsgConst.IS_OPEN_SWITCH_YES) {
+                    log.info("/**----------------------------------------发站内信开始-----------------------------------------**/");
                     String msgContent = memberTpl.getMsgContent();
                     Matcher matcher = pattern.matcher(msgContent);
                     int i = 0;
-                    while (matcher.find()) {
+                    while (matcher.find() && i < templateArray.length) {
                         msgContent = msgContent.replace(matcher.group(), templateArray[i++]);
                     }
+
                     MemberReceive memberReceive = new MemberReceive();
                     memberReceive.setMsgContent(msgContent);
                     memberReceive.setTplCode(memberTpl.getTplCode());
@@ -175,14 +178,16 @@ public class MqSendMsgConsumer {
                     memberReceive.setMsgSendTime(new Date());
                     memberReceive.setSource(MsgConst.SOURCE_MEMBER);
                     memberReceive.setPushId(0);
+                    log.info("站內信添加參數" + JSON.toJSONString(memberReceive));
                     memberReceiveModel.saveMemberReceive(memberReceive);
+                    log.info("/**----------------------------------------发站内信结束-----------------------------------------**/");
                 }
-                /**----------------------------------------发站内信结束-----------------------------------------**/
 
-                /**----------------------------------------微信推送开始-----------------------------------------**/
+
                 if (memberTpl.getWxSwitch() == MsgConst.IS_OPEN_SWITCH_YES) {
                     String memberDevOpenId = this.getWxDevOpenId(member);
-                    if (!StringUtils.isEmpty(memberDevOpenId)) {
+                    if (!StringUtils.isEmpty(memberDevOpenId) && memberTpl.getSmsContent().contains("templateId")) {
+                        log.info("/**----------------------------------------微信推送开始-----------------------------------------**/");
                         JSONObject jsonObjectForMsg = JSONObject.parseObject(memberTpl.getWxContent());
                         String templateId = jsonObjectForMsg.getString("templateId");
                         WXMsgSenderInfo wxMsgSenderInfo = new WXMsgSenderInfo();
@@ -210,6 +215,7 @@ public class MqSendMsgConsumer {
                         //调用微信接口，发送模板消息
                         WxMsgResult wxMsgResult = restTemplate.postForObject(String.format(MsgConst.PUSH_MESSAGE_URL, accessToken), wxMsgSenderInfo, WxMsgResult.class);
                         log.info("发送微信模板消息: " + wxMsgResult);
+                        log.info("/**----------------------------------------微信推送结束-----------------------------------------**/");
                     }
                 }
             }
@@ -295,6 +301,7 @@ public class MqSendMsgConsumer {
      */
     @RabbitListener(queues = StarterConfigConst.MQ_QUEUE_NAME_SELLER_MSG, containerFactory = StarterConfigConst.MQ_FACTORY_NAME_SINGLE_PASS_ERR)
     public void sellerMsgConsumer(MessageSendVO messageSendVO) {
+        log.info("发送商户消息,参数:" + JSON.toJSONString(messageSendVO));
         try {
             //网站名称
             String siteName = stringRedisTemplate.opsForValue().get("basic_site_name");
@@ -326,8 +333,8 @@ public class MqSendMsgConsumer {
                     continue;
                 }
                 if (storeSetting.getIsReceive().equals(MsgConst.IS_OPEN_SWITCH_YES)) {
-                    /**----------------------------------------发邮件-----------------------------------------**/
                     if (storeTpl.getEmailSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES) && !StringUtil.isEmpty(vendor.getVendorEmail())) {
+                        log.info("/**----------------------------------------发邮件-----------------------------------------**/");
                         JSONObject jsonObject = JSONObject.parseObject(storeTpl.getEmailContent());
                         String subject = jsonObject.getString("email_subject");
                         String content = jsonObject.getString("email_content");
@@ -346,43 +353,45 @@ public class MqSendMsgConsumer {
                         }
                         //发邮件
                         msgSendModel.sendMail(vendor.getVendorEmail(), subject, content);
+                        log.info("/**----------------------------------------发邮件结束-----------------------------------------**/");
                     }
-                    /**----------------------------------------发邮件结束-----------------------------------------**/
 
-                    /**----------------------------------------发短信--------------------------------------------**/
                     if (storeTpl.getSmsSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES) && !StringUtil.isEmpty(vendor.getVendorMobile())) {
-                        JSONObject jsonObject = JSONObject.parseObject(storeTpl.getSmsContent());
-                        SmsRequest smsRequest = new SmsRequest();
-                        smsRequest.setSmsType(SMSConst.NOTIFICATION_SMS);
-                        smsRequest.setMobile(vendor.getVendorMobile());
-                        if (DomainUrlUtil.SEND_SMS_TYPE == 1) {
-                            String templateId = jsonObject.getString("templateId");
-                            smsRequest.setTemplateId(templateId);
-                            smsRequest.setTemplateParam(templateArray);
-                        } else {
-                            String templateContent = jsonObject.getString("templateContent");
-                            //模板参数替换值
-                            String[] signParam = {smsSign};
-                            String[] templateParam = (String[]) ArrayUtils.addAll(signParam, templateArray);
-                            //正则匹配定义的变量
-                            Matcher matcher = pattern.matcher(templateContent);
-                            int i = 0;
-                            while (matcher.find()) {
-                                templateContent = templateContent.replace(matcher.group(), templateParam[i++]);
+                        if (storeTpl.getSmsContent().contains("templateId") || storeTpl.getSmsContent().contains("templateContent")) {
+                            log.info("/**----------------------------------------发短信--------------------------------------------**/");
+                            JSONObject jsonObject = JSONObject.parseObject(storeTpl.getSmsContent());
+                            SmsRequest smsRequest = new SmsRequest();
+                            smsRequest.setSmsType(SMSConst.NOTIFICATION_SMS);
+                            smsRequest.setMobile(vendor.getVendorMobile());
+                            if (DomainUrlUtil.SEND_SMS_TYPE == 1) {
+                                String templateId = jsonObject.getString("templateId");
+                                smsRequest.setTemplateId(templateId);
+                                smsRequest.setTemplateParam(templateArray);
+                            } else {
+                                String templateContent = jsonObject.getString("templateContent");
+                                //模板参数替换值
+                                String[] signParam = {smsSign};
+                                String[] templateParam = (String[]) ArrayUtils.addAll(signParam, templateArray);
+                                //正则匹配定义的变量
+                                Matcher matcher = pattern.matcher(templateContent);
+                                int i = 0;
+                                while (matcher.find()) {
+                                    templateContent = templateContent.replace(matcher.group(), templateParam[i++]);
+                                }
+                                smsRequest.setTemplateContent(templateContent);
                             }
-                            smsRequest.setTemplateContent(templateContent);
+                            log.info("短信参数：" + JSON.toJSONString(smsRequest));
+                            msgSendModel.sendSMS(smsRequest);
+                            log.info("/**----------------------------------------发短信结束-------------------------------------------**/");
                         }
-                        //发短信
-                        msgSendModel.sendSMS(smsRequest);
                     }
-                    /**----------------------------------------发短信结束-------------------------------------------**/
 
-                    /**----------------------------------------发站内信开始-----------------------------------------**/
                     if (storeTpl.getMsgSwitch().equals(MsgConst.IS_OPEN_SWITCH_YES)) {
+                        log.info("/**----------------------------------------发站内信开始-----------------------------------------**/");
                         String msgContent = storeTpl.getMsgContent();
                         Matcher matcher = pattern.matcher(msgContent);
                         int i = 0;
-                        while (matcher.find()) {
+                        while (matcher.find() && i < templateArray.length) {
                             msgContent = msgContent.replace(matcher.group(), templateArray[i++]);
                         }
                         StoreReceive storeReceive = new StoreReceive();
@@ -395,9 +404,11 @@ public class MqSendMsgConsumer {
                         storeReceive.setMsgSendTime(new Date());
                         storeReceive.setSource(MsgConst.SOURCE_STORE);
                         storeReceive.setPushId(0);
+                        log.info("站内信参数：" + JSON.toJSONString(storeReceive));
                         storeReceiveModel.saveStoreReceive(storeReceive);
+                        log.info("/**----------------------------------------发站内信结束-----------------------------------------**/");
                     }
-                    /**----------------------------------------发站内信结束-----------------------------------------**/
+
                 }
             }
         } catch (Exception e) {

b2b2c/b2b2c-web/src/main/resources/application.yml

@@ -22,9 +22,9 @@ slodon:
   b2b2c:
     datasource:
       write:
-        url: jdbc:mysql://localhost:3306/b2b2c?useUnicode=true&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://sld-mysql:3306/b2b2c?useUnicode=true&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
       read:
-        url: jdbc:mysql://localhost:3306/b2b2c?useUnicode=true&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://sld-mysql:3306/b2b2c?useUnicode=true&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 
 socketio:
 
@@ -75,6 +75,7 @@ secure:
       - "/v3/seller/seller/vendor/register"
       - "/v3/seller/seller/registerPayCallback/**"
       - "/v3/seller/seller/renewPayCallback/**"
+      - "/v3/video/admin/video/setting/getLiveSettingList"
       - "/resources/**"
     login-urls: #登录接口
       - "/v3/frontLogin/**"

b2b2c/sql/项目修改语句.sql

@@ -12,4 +12,10 @@ delete from msg_store_tpl where tpl_name in('换货提醒','换货超期自动
 
 -- 小程序
 update sys_setting set value = 'wx43aba958092afe0c' where name = 'login_wx_mini_appid';
-update sys_setting set value = '647d35cc24fc7996003168d44ea91a43' where name = 'login_wx_mini_appsecret';
+update sys_setting set value = '647d35cc24fc7996003168d44ea91a43' where name = 'login_wx_mini_appsecret';
+
+-- 微信支付
+update sys_setting set value='acAcsnklknskfnslalcn134643sljlda' where title='微信apikey';
+update sys_setting set value='wx43aba958092afe0c' where title='微信appid';
+update sys_setting set value='647d35cc24fc7996003168d44ea91a43' where title='微信appSecret';
+update sys_setting set value='1489871402' where title='微信商户号';