Merge branch 'master' of http://47.112.200.206:3000/shenhao/weixin

src/main/java/com/ssj/service/weixin/sales/service/impl/LibOrderDetailsServiceImpl.java

@@ -50,6 +50,7 @@ import com.ssj.framework.core.util.StringUtil;
 import com.ssj.framework.core.util.SystemResourceLocator;
 import com.ssj.framework.idworker.IdWorker;
 import com.ssj.framework.weixin.util.DateUtil;
+import com.ssj.framework.weixin.util.NewsUtil;
 import com.ssj.service.sys.codeexchange.CodeExchangeService;
 import com.ssj.service.sys.imlibuser.service.TbClassService;
 import com.ssj.service.sys.imlibuser.service.TbClassStudentService;
@@ -64,6 +65,8 @@ import com.ssj.service.weixin.sales.service.LibStaffingService;
 import com.ssj.service.weixin.sales.service.LibVipCodeService;
 import com.ssj.service.weixin.sales.service.LibVipServiceService;
 import com.ssj.service.weixin.user.service.UserService;
+import com.ssj.weixin.weixin.message.custom.Text;
+import com.ssj.weixin.weixin.message.custom.TextCustom;
 
 
 /** 
@@ -1528,6 +1531,8 @@ public class LibOrderDetailsServiceImpl extends BaseServiceImpl<LibOrderDetails,
 			libVip=vipService.save(libVip);
 		}
 		
+		libOrderDetails.setVipId(libVip.getId());
+		
 		try {
 			Date startTime=new Date();
 			
@@ -1575,11 +1580,21 @@ public class LibOrderDetailsServiceImpl extends BaseServiceImpl<LibOrderDetails,
 			
 			//给学生增加一个默认的永久校区批改服务
 			libVipServiceService.insertLibServiceByType(libVip.getId(), libJoin.getId(), libOrderDetails.getEndTime(), libJoin.getSignType());
-            
-			logger.info("小塾学伴缴费支付成功后，添加销售订单"+libOrderDetails.getId());
 			
 			tokenManager.createServiceCount("ZUOYB_SERVICE_"+libVip.getId()+"_"+libOrderDetails.getLibId(), "1");	
-
+			
+			logger.info("小塾学伴缴费支付成功后，添加销售订单"+libOrderDetails.getId());
+			
+			if(user!=null && StringUtils.isNotEmpty(user.getAccount())){
+			    String fromUrl="https://pan.baidu.com/s/16IWXLP4s7U3reZRUxX5afg";
+				TextCustom  textCustom  =new TextCustom();
+				textCustom.setMsgtype("text");
+				textCustom.setTouser(user.getAccount());
+				Text text = new  Text();
+				text.setContent("恭喜您成功领取价值399元的『1-6年级全科开学大礼包』，<a href=\""+fromUrl+"\">点击打开网盘地址</a>");
+				textCustom.setText(text);
+				NewsUtil.send(tokenManager.getSSJAccessToken(), textCustom);
+		    }
 		}catch(Exception e){
 			e.printStackTrace();
 			logger.error("保存购卡信息异常");

src/main/java/com/ssj/weixin/payment/controller/PaymentController.java

@@ -1158,7 +1158,6 @@ public class PaymentController extends BaseController {
 		model.addAttribute("user", user);
 		model.addAttribute("tbLibJoin", tbLibJoin);
 		model.addAttribute("specieList", specieList);
-
 		return "weixin/vip/serviceVipBuy";
 	}
 	

src/main/resources/templates/weixin/vip/serviceBuyOk.html

@@ -30,19 +30,17 @@
 					<div class="tiptxt">
 <!-- 						<img th:src="${imgUrl}+'/images/Group 9.png'" /> -->
 						<br/>
-						<h3>请扫描二维码</h3>
-						<h3>下载小塾学伴app</h3>
+						<h3>扫码加关注，接收操作指引</h3>
 					</div>
 				</div>
 				<div class="panel panelshodow">
 					<div class="txt" >
 						<p >
-							<img th:src="@{/static/images/qrcode-icon.png}">
+							<img th:src="@{/static/images/qrcode-icon_2.png}">
 						</p>
-						下载后直接用填写的手机号即可登录
 					</div>
 				</div>
-
+				<br/>
 				<div class="panel">
 					<a href="javascript:void(0);" id="save" class="btn-blue">关闭</a>
 				</div>