Browse Source

Merge branch 'release_real_20211001' of https://git.malls.iformall.com/server/formallProject into release_real_20211001

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
3ff603b9bc
8 changed files with 65 additions and 18 deletions
  1. +33
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxOrderService.java
  4. +7
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  6. +4
    -4
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java
  7. +7
    -0
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml
  8. +1
    -1
      mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java

+ 33
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java View File

@@ -401,5 +401,38 @@ public class WxOrderController extends BaseController {
}
}

@ApiOperation("购物车订单详情接口")
@GetMapping("goodsDetail")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", paramType = "query", required = true)
})
public ResultData goodsDetail(String mainOrderId) {
if (StringUtils.isBlank(mainOrderId) || mainOrderId.equalsIgnoreCase(Constant.UNDEFINED)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
// c端用户应该只能看到自己的订单细节
WxOrder wxOrder = new WxOrder();
Long composeOrderId = 0L;
try {
composeOrderId = Long.valueOf(mainOrderId);
} catch (NumberFormatException e) {
logger.error("parse composeOrderId failed");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常:"+mainOrderId);
}
wxOrder.setComposeOrderId(composeOrderId);
Long memberId;
try {
memberId = getMemberId();
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
wxOrder.setCUserId(memberId);
List<WxOrderCouponVo> wxOrders = wxOrderService.goodsDetailCUserVo(wxOrder);
if (wxOrders == null)
return new ResultData(ErrorCode.ORDER_IS_NOT_FIND);

return new ResultData(wxOrders);
}


}

+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java View File

@@ -65,12 +65,12 @@ public class BaseTenantEntity extends BaseEntity {
}
}

public TenantEntity getTenantInfo() {
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);
return tenantEntity;
}
// public TenantEntity getTenantInfo() {
// TenantEntity tenantEntity = new TenantEntity();
// tenantEntity.setTenantId(tenantId);
// tenantEntity.setParentTenantId(parentTenantId);
// return tenantEntity;
// }

public String getTenantId() {
return tenantId;


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxOrderService.java View File

@@ -154,6 +154,7 @@ public interface WxOrderService {


WxOrderCouponVo detailCUserVo(WxOrder record);
List<WxOrderCouponVo> goodsDetailCUserVo(WxOrder wxOrder);

void stockBack(WxOrder updateOrder);

@@ -242,4 +243,5 @@ public interface WxOrderService {
//ResultData saveOrder(OrderSaveDto orderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity);
ResultData composeSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity);

}

+ 7
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java View File

@@ -46,16 +46,16 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
public WxFloatingLayer getFloatingLayer(String openId, String appId) {
WxAppinfo appinfo = appinfoMapper.findByAppId(appId);
if (StringUtils.isBlank(openId)) {
return getWxFloatingLayer(appinfo.getTenantInfo());
return getWxFloatingLayer(appinfo.getTenantId());
}
//1 查看是否存在用户,用户不存在 直接返回浮层信息
WxCUser user = new WxCUser();
user.setOpenId(openId);
user.setAppId(appId);
user.updateTenantInfo(appinfo);
user.setTenantId(appinfo.getTenantId());
WxCUser byOpenId = wxCUserMapper.findByOpenId(user);
if (byOpenId == null) {
return getWxFloatingLayer(appinfo.getTenantInfo());
return getWxFloatingLayer(appinfo.getTenantId());
}
//2 用户存在 查看是否已有弹出记录 没有 保存记录后返回浮层信息
WxCuserFloatingLayer wxCuserFloatingLayerQuery = new WxCuserFloatingLayer();
@@ -68,7 +68,7 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
logger.error("用户 {} 已弹过浮层",byOpenId.getId());
return null;
}
return getWxFloatingLayer(byOpenId);
return getWxFloatingLayer(byOpenId.getTenantId());
//merge from develop: 分支逻辑
// WxFloatingLayer wxFloatingLayer = getWxFloatingLayer(byOpenId);
// if (wxFloatingLayer != null) {
@@ -84,15 +84,15 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
wxCuserFloatingLayer = new WxCuserFloatingLayer();
final IdWorker idWorker = IdWorker.get();
wxCuserFloatingLayer.setId(idWorker.nextId());
wxCuserFloatingLayer.setTenantId(wxCUser.getTenantId());
wxCuserFloatingLayer.setUserId(wxCUser.getId());
wxCuserFloatingLayer.updateTenantInfo(wxCUser);
wxCuserFloatingLayer.setCreateTime(new Date());
wxCuserFloatingLayerMapper.insert(wxCuserFloatingLayer);
}

public WxFloatingLayer getWxFloatingLayer(TenantEntity tenantEntity) {
public WxFloatingLayer getWxFloatingLayer(String tenantId) {
WxFloatingLayer wxFloatingLayer = new WxFloatingLayer();
wxFloatingLayer.updateTenantInfo(tenantEntity);
wxFloatingLayer.setTenantId(tenantId);
wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode());
return wxFloatingLayerMapper.selectOne(new QueryWrapper<>(wxFloatingLayer));
}


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -1742,6 +1742,11 @@ public class WxOrderServiceImpl implements WxOrderService {
return null;
}

@Override
public List<WxOrderCouponVo> goodsDetailCUserVo(WxOrder record) {
return wxOrderMapper.selectDetailOfCUser(record);
}

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void shareForMicroPay(TenantEntity tenantEntity, Long orderId, Long payOrderId,EnumPayWay payWay) {


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java View File

@@ -47,10 +47,10 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService {
public void send(BaseMsg baseMsg) throws Exception{
AppUniformMsg appUniformMsg = (AppUniformMsg)baseMsg;

TenantEntity tenantEntity = appUniformMsg.getTenantInfo();
if (StringUtils.isBlank(tenantEntity.getTenantId())) {
String tenantId = appUniformMsg.getTenantId();
if (StringUtils.isBlank(tenantId)) {
WxAppinfo appinfo = appinfoMapper.findByAppId(appUniformMsg.getAppId());
tenantEntity = appinfo.getTenantInfo();
tenantId = appinfo.getTenantId();
}
WxTemplateMsg msg = null;

@@ -58,7 +58,7 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService {

// 查询信息模板
WxTemplateMsg msgQ = new WxTemplateMsg();
msgQ.updateTenantInfo(tenantEntity);
msgQ.setTenantId(tenantId);
msgQ.setType(appUniformMsg.getTemplateType());
try {
msg = wxTemplateMsgMapper.selectOne(new QueryWrapper(msgQ));


+ 7
- 0
mallinkService/src/main/resources/mapper/WxOrderMapper.xml View File

@@ -381,6 +381,9 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and o.`parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != composeOrderId ">
and o.`compose_order_id` = #{composeOrderId}
</if>
<if test="orderStatus != null">
AND o.order_status = #{orderStatus}
</if>
@@ -403,6 +406,10 @@
<if test=" null != parentTenantId and '' != parentTenantId">
and o.`parent_tenant_id` = #{parentTenantId}
</if>

<if test=" null != composeOrderId ">
and o.`compose_order_id` = #{composeOrderId}
</if>
<if test="id != null">
and o.id = #{id}
</if>


+ 1
- 1
mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java View File

@@ -128,7 +128,7 @@ public class TtUserGrantController extends BaseController {
String ipaddress = IPUtil.getIpAddr(request);

TtCUser newUser = new TtCUser();
newUser.updateTenantInfo(wxAppinfo.getTenantInfo());
newUser.setTenantId(wxAppinfo.getTenantId());
newUser.setAppId(appId);
newUser.setOpenId(openId);



Loading…
Cancel
Save