|
|
@@ -9,9 +9,7 @@ import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.vo.WxCouponCVo; |
|
|
import com.iformall.domain.vo.WxCouponCVo; |
|
|
import com.iformall.domain.vo.WxCouponOrderBVo; |
|
|
import com.iformall.domain.vo.WxCouponOrderBVo; |
|
|
import com.iformall.domain.vo.WxCouponOrderCVo; |
|
|
import com.iformall.domain.vo.WxCouponOrderCVo; |
|
|
import com.iformall.enums.EnumCouponType; |
|
|
|
|
|
import com.iformall.enums.EnumCouponValidType; |
|
|
|
|
|
import com.iformall.enums.EnumCreditLockedStatus; |
|
|
|
|
|
|
|
|
import com.iformall.enums.*; |
|
|
import com.iformall.exception.MallinkException; |
|
|
import com.iformall.exception.MallinkException; |
|
|
import com.iformall.service.*; |
|
|
import com.iformall.service.*; |
|
|
import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.Api; |
|
|
@@ -369,4 +367,40 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
|
|
|
|
|
return new ResultData(); |
|
|
return new ResultData(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "商品发货", notes = "{\"id\":\"string\", \"deliveryInfo\":\"string\"}") |
|
|
|
|
|
@PostMapping("/sendGoods") |
|
|
|
|
|
public ResultData sendGoods(@RequestBody WxCouponOrder wxCouponOrder) { |
|
|
|
|
|
logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::postpone"); |
|
|
|
|
|
if (wxCouponOrder == null || wxCouponOrder.getId() == null) { |
|
|
|
|
|
logger.error("id不能为空: "); |
|
|
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
|
|
} |
|
|
|
|
|
try { |
|
|
|
|
|
WxCouponOrder couponOrder = wxCouponOrderService.getById(wxCouponOrder.getId(), getTenantInfo().getTenantId()); |
|
|
|
|
|
if(couponOrder==null){ |
|
|
|
|
|
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); |
|
|
|
|
|
} |
|
|
|
|
|
WxCouponOrder updateCouponOrder = new WxCouponOrder(); |
|
|
|
|
|
updateCouponOrder.setId(couponOrder.getId()); |
|
|
|
|
|
if(EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ |
|
|
|
|
|
updateCouponOrder.setShippingStatus(EnumOrderShopingStatus.READY_SELF_MENTION.getCode()); |
|
|
|
|
|
}else if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(couponOrder.getShippingType())){ |
|
|
|
|
|
if(StringUtils.isBlank(wxCouponOrder.getDeliveryInfo())){ |
|
|
|
|
|
return new ResultData(ErrorCode.COUPON_GOODS_DELIVERY_NULL); |
|
|
|
|
|
} |
|
|
|
|
|
updateCouponOrder.setShippingStatus(EnumOrderShopingStatus.WAIT_DISTRIBUTION.getCode()); |
|
|
|
|
|
updateCouponOrder.setDeliveryInfo(wxCouponOrder.getDeliveryInfo()); |
|
|
|
|
|
}else{ |
|
|
|
|
|
return new ResultData(ErrorCode.COUPON_GOODS_TYPE_NOT_SUPPORTED); |
|
|
|
|
|
} |
|
|
|
|
|
updateCouponOrder.setUpdateDate(new Date()); |
|
|
|
|
|
wxCouponOrderService.saveOrUpdate(updateCouponOrder); |
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
logger.error(e.getMessage()); |
|
|
|
|
|
return new ResultData(ErrorCode.SYS_SERVER_ERROR); |
|
|
|
|
|
} |
|
|
|
|
|
return new ResultData(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |