Browse Source

[拼团][修改][去拼团]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
5f93140514
5 changed files with 71 additions and 4 deletions
  1. +22
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxOrderGroupService.java
  4. +41
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
  5. +4
    -0
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 22
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java View File

@@ -69,7 +69,28 @@ public class WxOrderGroupController extends BaseController {
return new ResultData(page);
}

@ApiOperation(value = "拼团状态")
@ApiOperation(value = "去拼团")
@GetMapping("toOrderGroup")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderId", value = "orderId", dataType = "Long", paramType = "query", required = true),
@ApiImplicitParam(name = "couponId", value = "couponId", dataType = "Long", paramType = "query", required = true),
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true),
})
public ResultData toOrderGroup(@ModelAttribute WxOrderGroup wxOrderGroup) {
if (wxOrderGroup.getId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空");
}
if (wxOrderGroup.getCouponId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空");
}
if (wxOrderGroup.getOrderId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空");
}
wxOrderGroup.setTenantId(getTenantId());
return wxOrderGroupService.toOrderGroup(wxOrderGroup);
}

@ApiOperation(value = "查询拼团状态")
@GetMapping("queryOrderGroupStatus")
@ApiImplicitParams({
@ApiImplicitParam(name = "orderId", value = "orderId", dataType = "Long", paramType = "query", required = true),


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java View File

@@ -42,4 +42,6 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> {
WxOrderCouponPressVo selectDetailOfPress(WxOrder wxOrder);
void updateStatusByPressCouponId(WxOrder wxOrder);

void updateStatusByOrderGroupId(WxOrder order);

}

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

@@ -19,6 +19,8 @@ public interface WxOrderGroupService {

PageInfo<Map<String, Object>> queryOrderGroup(WxOrder wxOrder, Integer pageNum, Integer pageSize);

ResultData toOrderGroup(WxOrderGroup wxOrderGroup);

ResultData queryOrderGroupStatus(WxOrderGroup wxOrderGroup);

}

+ 41
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java View File

@@ -7,6 +7,7 @@ import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumCouponStatus;
import com.iformall.enums.EnumOrderStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*;
@@ -24,6 +25,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
* @author gongbiao
@@ -152,7 +154,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
}

@Override
public ResultData queryOrderGroupStatus(WxOrderGroup wxOrderGroup) {
public ResultData toOrderGroup(WxOrderGroup wxOrderGroup) {
WxOrder wxOrder = new WxOrder();
wxOrder.setId(wxOrderGroup.getOrderId());
List<Map<String, Object>> couponOrderGroupList = wxOrderGroupMapper.queryOrderGroup(wxOrder);
@@ -176,9 +178,45 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
}
WxCUser user = new WxCUser();
user.setIds(ids);
List<WxCUser> userList = wxCUserMapper.findList(user);
List<WxCUser> userList = wxCUserMapper.findList(user).stream().map(u -> {
WxCUser temp = new WxCUser();
temp.setId(u.getId());
temp.setNickName(u.getNickName());
temp.setAvatarUrl(u.getAvatarUrl());
return temp;
}).collect(Collectors.toList());
couponOrderGroup.put("userList", userList);
}
return new ResultData(Result.SUCCESS, "查询成功", couponOrderGroup);
return new ResultData(couponOrderGroup);
}

@Override
public ResultData queryOrderGroupStatus(WxOrderGroup wxOrderGroup) {
Long id = wxOrderGroup.getId();
WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(id);
WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(wxOrderGroup.getCouponId());
Integer status = wxCoupon.getStatus();
if (status.equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) {
group.setStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode());
returnMoney(group);
}
// 查看是否超时
Date expiredDate = group.getExpiredDate();
if (new Date().after(expiredDate)) {
group.setStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode());
returnMoney(group);
}
return toOrderGroup(wxOrderGroup);
}

public void returnMoney(WxOrderGroup group) {
//券失效或拼团超时 修改 拼团的状态
wxOrderGroupMapper.updateByPrimaryKeySelective(group);
WxOrder order = new WxOrder();
order.setTenantId(group.getTenantId());
order.setOrderGroupId(group.getId());
order.setOrderStatus(group.getStatus());
wxOrderMapper.updateStatusByOrderGroupId(order);
//退款流程 TODO gongbiao
}
}

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

@@ -681,4 +681,8 @@

</select>
<update id="updateStatusByOrderGroupId" parameterType="com.iformall.domain.po.WxOrder">
update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} and order_group_id=#{orderGroupId}
</update>

</mapper>

Loading…
Cancel
Save