老师代买

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
         http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
             .authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
                 .and()
-                .authorizeRequests().antMatchers("/wechat/*","/v2/api-docs", "/code/*","/payment/callback/**",
+                .authorizeRequests().antMatchers("/wechat/*","/v2/api-docs", "/code/*","/payment/callback",
                  "/order/paySuccess/test","/order/cancelUserOrder/test","/open/**","/task/**")
             .permitAll().anyRequest().authenticated().and().httpBasic();
     }

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/domain/OrderParam.java

@@ -28,6 +28,17 @@ public class OrderParam {
     @ApiModelProperty("订单金额")
     private BigDecimal orderAmount;
 
+    @ApiModelProperty("代码用户id")
+    private Long  userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public BigDecimal getOrderAmount() {
         return orderAmount;
     }

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -127,6 +127,9 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         List<OmsOrderItem> orderItemList = new ArrayList<>();
         //获取购物车及优惠信息
         UmsMember currentMember = memberService.getCurrentMember();
+        if (orderParam.getUserId() != null && orderParam.getUserId() > 0) {
+            currentMember = memberService.getById(orderParam.getUserId());
+        }
         List<CartPromotionItem> cartPromotionItemList = cartItemService.listPromotion(currentMember.getId(),
                                                                                       orderParam.getCartIds(), true);
         for (CartPromotionItem cartPromotionItem : cartPromotionItemList) {

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/UmsMemberServiceImpl.java

@@ -56,7 +56,15 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 
     @Override
     public UmsMember getById(Long id) {
-        return memberMapper.selectByPrimaryKey(id);
+        UmsMember umsMember = memberMapper.selectByPrimaryKey(id);
+        if (umsMember == null) {
+            SysUser sysUser = sysUserFeignService.queryUserById(id.intValue());
+            if (sysUser == null || sysUser.getId() == null) {
+                throw new BizException("用户信息获取失败");
+            }
+            umsMember = getUmsMember(sysUser, umsMember);
+        }
+        return umsMember;
     }
 
     @Override
@@ -66,6 +74,11 @@ public class UmsMemberServiceImpl implements UmsMemberService {
             throw new BizException("用户信息获取失败");
         }
         UmsMember umsMember = getById(sysUser.getId().longValue());
+        umsMember = getUmsMember(sysUser, umsMember);
+        return umsMember;
+    }
+
+    private UmsMember getUmsMember(SysUser sysUser, UmsMember umsMember) {
         // 商城库用户不存在-> 创建
         if (umsMember == null || umsMember.getId() == null) {
             umsMember = new UmsMember();