helixiao 1 год назад
Родитель
Сommit
639f20a86b

+ 6 - 1
linkwe-api/src/main/java/com/linkwechat/controller/WeIntelligentMarkController.java

@@ -7,6 +7,8 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.linkwechat.common.core.controller.BaseController;
 import com.linkwechat.common.core.domain.AjaxResult;
+import com.linkwechat.common.core.domain.model.LoginUser;
+import com.linkwechat.common.core.domain.model.WxLoginUser;
 import com.linkwechat.common.core.page.TableDataInfo;
 import com.linkwechat.common.utils.SecurityUtils;
 import com.linkwechat.domain.WeIntelligentMark;
@@ -70,7 +72,10 @@ public class WeIntelligentMarkController extends BaseController {
 	public AjaxResult add(@RequestBody WeIntelligentMark WeIntelligentMark) {
 		WeIntelligentMark.setCreateTime(new Date());
 		WeIntelligentMark.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
-		weIntelligentMarkService.save(WeIntelligentMark);
+		String userKey = SecurityUtils.getUserKey();
+		LoginUser loginUser = SecurityUtils.getLoginUser();
+		WxLoginUser wxLoginUser = SecurityUtils.getWxLoginUser();
+//		weIntelligentMarkService.save(WeIntelligentMark);
 		return AjaxResult.success("添加成功!");
 	}
 	

+ 6 - 5
linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/bdshdb/customer/scheduled/ScheduledIntelligentService.java

@@ -169,7 +169,8 @@ public class ScheduledIntelligentService {
                             List<LocaOrder> locaOrders = localOrderMapper.selectList(new LambdaQueryWrapper<LocaOrder>()
                                     .eq(LocaOrder::getUserId, localAppUser.getId()).ne(LocaOrder::getState, "1"));
                             if (locaOrders.size() > 0) {
-                                BigDecimal reduce = locaOrders.stream().map(order -> Optional.ofNullable(order.getOrderPrice()).orElse(BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add);
+                                BigDecimal reduce = locaOrders.stream().map(order -> Optional.ofNullable(order.getOrderPrice())
+                                        .orElse(BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add);
                                 String markRules1 = s.getMarkRules1();
                                 BigDecimal bigDecimal = new BigDecimal(markRules1);
                                 //订单金额超过规则值
@@ -179,7 +180,7 @@ public class ScheduledIntelligentService {
                                 }
                             }
                         } else {
-                            log.info("------------生活平台{" + t.getCustomerName() + "}用户不存在!历史消费标签未打成功!------------");
+                            log.info("----------生活平台{" + t.getCustomerName() + "}用户不存在!历史消费标签未打成功!---------");
                         }
                     }
                 });
@@ -227,7 +228,7 @@ public class ScheduledIntelligentService {
                             }
                         }
                     } else {
-                        log.info("------------生活平台{" + w.getCustomerName() + "}用户不存在,或者无登录时间!沉默客户30天标签未打成功!------------");
+                        log.info("---生活平台{" + w.getCustomerName() + "}用户不存在,或者无登录时间!沉默客户30天标签未打成功!-- -");
                     }
                 });
             } else if ("ACT005".equals(actionId)) {//首次消费下单
@@ -244,7 +245,7 @@ public class ScheduledIntelligentService {
                                 extracted(weTag1, t, list);
                             }
                         } else {
-                            log.info("------------生活平台{" + t.getCustomerName() + "}用户不存在!首次消费下单标签未打成功!------------");
+                            log.info("------生活平台{" + t.getCustomerName() + "}用户不存在!首次消费下单标签未打成功!--------");
                         }
                     }
 
@@ -261,7 +262,7 @@ public class ScheduledIntelligentService {
                                 extracted(weTag1, t, list);
                             }
                         } else {
-                            log.info("------------生活平台{" + t.getCustomerName() + "}用户不存在!会员钻石等级变动标签未打成功!------------");
+                            log.info("------生活平台{" + t.getCustomerName() + "}用户不存在!会员钻石等级变动标签未打成功!-----");
                         }
                     }
                 });