Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改微信基础数据

Browse Source
This commit is contained in:
huangdeliang
2021-05-07 14:53:26 +08:00
parent a7238b5b88
commit ca5e1bb5f1
10 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderNutritionistReplaceRecordController.java
View File

@ -111,12 +111,14 @@ public class SysOrderNutritionistReplaceRecordController extends BaseController
return AjaxResult.error("开始时间不能小于"+ DateUtils.dateTime(sysOrder.getCommissStartTime()));
}
//更换的售后或营养师不能与原订单一致
if(sysOrderNutritionistReplaceRecord.getNutritionistId() != null && sysOrder.getNutritionistId().longValue() == sysOrderNutritionistReplaceRecord.getNutritionistId().longValue()){
return AjaxResult.error("更换的营养师与原订单营养师不能相同");
}
if(sysOrderNutritionistReplaceRecord.getAfterSaleId() != null && sysOrder.getAfterSaleId().longValue() == sysOrderNutritionistReplaceRecord.getAfterSaleId().longValue()){
return AjaxResult.error("更换的售后与原订单售后不能相同");
}
// if(sysOrderNutritionistReplaceRecord.getNutritionistId() != null && sysOrder.getNutritionistId().longValue() == sysOrderNutritionistReplaceRecord.getNutritionistId().longValue()){
// return AjaxResult.error("更换的营养师与原订单营养师不能相同");
// }
// if(sysOrderNutritionistReplaceRecord.getAfterSaleId() != null && sysOrder.getAfterSaleId().longValue() == sysOrderNutritionistReplaceRecord.getAfterSaleId().longValue()){
// return AjaxResult.error("更换的售后与原订单售后不能相同");
// }
//体验单、二开售后提成单都不支持更换营养师和售后
if(sysOrder.getAfterSaleCommissOrder().intValue() == 1 || "2".equals(sysOrder.getOrderType())){
return AjaxResult.error("二开提成单、体验单不支持更换营养师、售后");

46
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
View File

@ -1,6 +1,8 @@
package com.stdiet.web.controller.custom;
import com.aliyun.vod20170321.models.GetPlayInfoResponseBody;
import com.aliyun.vod20170321.models.GetVideoInfoResponseBody;
import com.aliyun.vod20170321.models.GetVideoListResponseBody;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.page.TableDataInfo;
@ -358,13 +360,13 @@ public class WechatAppletController extends BaseController {
* 获取视频列表
*/
@GetMapping(value = "/getVideoList")
public AjaxResult getVideoList(SysNutritionalVideo sysNutritionalVideo, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "5")int pageSize) {
public AjaxResult getVideoList(SysNutritionalVideo sysNutritionalVideo, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "5") int pageSize) {
AjaxResult result = AjaxResult.success();
int total = 0;
List<NutritionalVideoResponse> nutritionalVideoList = new ArrayList<>();
try{
try {
GetVideoListResponseBody videoListResponseBody = AliyunVideoUtils.getVideoListByPage(null, "Normal", pageNum, pageSize);
if(videoListResponseBody != null){
if (videoListResponseBody != null) {
total = videoListResponseBody.total;
for (GetVideoListResponseBody.GetVideoListResponseBodyVideoListVideo video : videoListResponseBody.videoList.video) {
NutritionalVideoResponse nutritionalVideoResponse = new NutritionalVideoResponse();
@ -376,10 +378,10 @@ public class WechatAppletController extends BaseController {
nutritionalVideoList.add(nutritionalVideoResponse);
}
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
result.put("total",total);
result.put("total", total);
result.put("rows", nutritionalVideoList);
return result;
}
@ -392,18 +394,18 @@ public class WechatAppletController extends BaseController {
public AjaxResult getVideoDetailById(@RequestParam(value = "videoId") String videoId) {
AjaxResult result = AjaxResult.success();
NutritionalVideoResponse nutritionalVideoResponse = new NutritionalVideoResponse();
try{
GetPlayInfoResponseBody playInfoResponseBody = AliyunVideoUtils.getVideoVisitDetail(videoId);
GetVideoInfoResponseBody videoInfoResponseBody = AliyunVideoUtils.getVideoById(videoId);
List<GetPlayInfoResponseBody.GetPlayInfoResponseBodyPlayInfoListPlayInfo> playList = playInfoResponseBody.playInfoList.playInfo;
if (playList != null && playList.size() > 0) {
nutritionalVideoResponse.setPlayUrl(playList.get(0).getPlayURL());
}
nutritionalVideoResponse.setDescription(videoInfoResponseBody.video.getDescription());
nutritionalVideoResponse.setTags(videoInfoResponseBody.video.getTags());
nutritionalVideoResponse.setTitle(videoInfoResponseBody.video.getTitle());
//nutritionalVideoResponse.setCreateTime(sysNutritionalVideo.getCreateTime() == null ? "" : DateUtils.dateTime(sysNutritionalVideo.getCreateTime()));
}catch (Exception e){
try {
GetPlayInfoResponseBody playInfoResponseBody = AliyunVideoUtils.getVideoVisitDetail(videoId);
GetVideoInfoResponseBody videoInfoResponseBody = AliyunVideoUtils.getVideoById(videoId);
List<GetPlayInfoResponseBody.GetPlayInfoResponseBodyPlayInfoListPlayInfo> playList = playInfoResponseBody.playInfoList.playInfo;
if (playList != null && playList.size() > 0) {
nutritionalVideoResponse.setPlayUrl(playList.get(0).getPlayURL());
}
nutritionalVideoResponse.setDescription(videoInfoResponseBody.video.getDescription());
nutritionalVideoResponse.setTags(videoInfoResponseBody.video.getTags());
nutritionalVideoResponse.setTitle(videoInfoResponseBody.video.getTitle());
//nutritionalVideoResponse.setCreateTime(sysNutritionalVideo.getCreateTime() == null ? "" : DateUtils.dateTime(sysNutritionalVideo.getCreateTime()));
} catch (Exception e) {
e.printStackTrace();
}
result.put("videoDetail", nutritionalVideoResponse);
@ -435,13 +437,15 @@ public class WechatAppletController extends BaseController {
sysWxUserInfo.setCusId(sysCustomer.getId());
sysWxUserInfo.setCreateTime(DateUtils.getNowDate());
sysWxUserInfoService.insertSysWxUserInfo(sysWxUserInfo);
} else {
// 更新sys_wx_user_info数据，
curWxUserInfo.setCusId(sysCustomer.getId());
curWxUserInfo.setUpdateTime(DateUtils.getNowDate());
sysWxUserInfoService.updateSysWxUserInfo(curWxUserInfo);
}
}
// 更新sys_wx_user_info数据，并返回一系列登录后的数据
curWxUserInfo.setUpdateTime(DateUtils.getNowDate());
sysWxUserInfoService.updateSysWxUserInfo(curWxUserInfo);
// 并返回一系列登录后的数据
return AjaxResult.success(curWxUserInfo);
}
}