Merge branch 'master' into 小助手门店操作退款-oms-基于pre分支

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -522,7 +522,7 @@ public class OrderAdapterServiceImpl {
                 request.setMiniAppId(orderBean.getAppId());
                 response = ecologyProgramApplicationClient.reportActivityBehaviors(request);
                 if (!Objects.equals(response.getCode(), "100")) {
-                    if(Objects.equals(response.getMessage(), "用户未参加或已退出该活动")){//用户未报名活动的过滤掉
+                    if(!Objects.equals(response.getMessage(), "用户未参加或已退出该活动")){//用户未报名活动的过滤掉
                         emailAlertService.sendEmailAlert("低碳活动上报失败", String.format("request:%s \r\nresponse:%s \r\norderNo:%s", JSONObject.toJSONString(request), JSONObject.toJSONString(response), orderBean.getOid()));
                     }
                     ApiLog.printLog("sendLowCarbonToWeixin error "+orderBean.getOid(), message,request,response);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java

@@ -359,7 +359,7 @@ public class CouponServiceImpl implements CouponService {
                 if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_1.getCode())) {
                     activityCouponBean.setDiscountAmount(couponStateVo.getOriginalPrice() + "");
                 } else if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_3.getCode())) {
-                    // TODO 折扣券 百分值10 乘以10   前端统一除以100作为操作依据
+                    // TODO 折扣券 百分值10 乘以10   前端统一除以100作为操作依据 _> 废弃, 现在默认 不乘10
                     activityCouponBean.setDiscountAmount(couponStateVo.getDiscount() != null ? couponStateVo.getDiscount() * 10 + "" : "0");
                 }else if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_5.getCode())) {
                     // 这里需要加入 配送券逻辑  如果为null 表示 配送券金额 全免, 否则就是部分减免