wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1；权限 

2；eleme回调url
3；店铺删除后也能查看营销记录
This commit is contained in:
wangshuai 2024-07-23 18:58:25 +08:00
parent a88f865b6f
commit 34cffd2b0d
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java
View File

@ -128,7 +128,7 @@ public class BusTemplateInfoController extends BaseController
/** /**
* 删除模版 * 删除模版
*/ */
@PreAuthorize("@ss.hasPermi('business:template:remove')") // @PreAuthorize("@ss.hasPermi('business:template:remove')")
@Log(title = "模版", businessType = BusinessType.DELETE) @Log(title = "模版", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)

4
ruoyi-admin/src/main/java/com/ruoyi/business/controller/ElemeController.java
View File

@ -1,7 +1,5 @@
package com.ruoyi.business.controller; package com.ruoyi.business.controller;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -13,7 +11,7 @@ public class ElemeController {
@GetMapping("/message_receive") @GetMapping("/message_receive")
public String msg() { public String msg() {
return "{\"message\":\"ok\"}"; return "{\"code\":\"200\",\"message\":\"ok\"}";
} }

2
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java
View File

@ -63,7 +63,7 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService
}else{ }else{
info.setBindId(SecurityUtils.getLoginUser().getUserId()); info.setBindId(SecurityUtils.getLoginUser().getUserId());
} }
List<BusStoreInfo> list = storeInfoMapper.selectBusStoreInfoList(info); List<BusStoreInfo> list = storeInfoMapper.selectBusStoreInfoListA(info);
if (list.size() != 0) { if (list.size() != 0) {
List<String> sl = new ArrayList<>(); List<String> sl = new ArrayList<>();
for (BusStoreInfo storeInfo : list) { for (BusStoreInfo storeInfo : list) {

5
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
View File

@ -380,8 +380,8 @@ public class MeituanServiceImpl implements IMeituanService {
for (int i = 0; i < array.size(); i++) { for (int i = 0; i < array.size(); i++) {
BusOrderInfo orderInfo = new BusOrderInfo(); BusOrderInfo orderInfo = new BusOrderInfo();
Object o = array.get(i); Object o = array.get(i);
JSONObject oj = JSONObject.parseObject(JSON.toJSONString(o));
try { try {
JSONObject oj = JSONObject.parseObject(JSON.toJSONString(o));
String isPhf = oj.getString("businessType"); String isPhf = oj.getString("businessType");
JSONObject order0 = oj.getJSONObject("orderInfo"); JSONObject order0 = oj.getJSONObject("orderInfo");
JSONObject commonInfo = oj.getJSONObject("commonInfo"); JSONObject commonInfo = oj.getJSONObject("commonInfo");
@ -441,7 +441,8 @@ public class MeituanServiceImpl implements IMeituanService {
} }
orderInfo.setIsPhf(isPhf); orderInfo.setIsPhf(isPhf);
}catch (Exception e){ }catch (Exception e){
System.out.println(e.getMessage()); System.out.println(wmPoiId+" "+oj.toJSONString());
e.printStackTrace();
continue; continue;
} }
list.add(orderInfo); list.add(orderInfo);