商城

mec-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrder.java

@@ -15,11 +15,11 @@ public class OmsOrder implements Serializable {
 
     private String couponId;
 
-    @ApiModelProperty("下单平台 STUDENT TEACHER")
+    @ApiModelProperty("订单来源应用 SCHOOL:学校,STUDENT:学生,TEACHER:老师")
     private String platformType;
 
 
-    @ApiModelProperty(value = "订单来源 ")
+    @ApiModelProperty(value = "订单来源平台 MEC,GYT,KLX,KT,MALL ")
     private String orderFormType;
 
     @ApiModelProperty(value = "订单编号")
@@ -58,7 +58,7 @@ public class OmsOrder implements Serializable {
     @ApiModelProperty(value = "支付方式：0->未支付；1->支付宝；2->微信")
     private Integer payType;
 
-    @ApiModelProperty(value = "订单来源：0->PC订单；1->app订单 2->学校订单 ")
+    @ApiModelProperty(value = "订单来源类型：0->PC订单；1->app订单 2->学校采购 3 个人订单 4 其他订单 ")
     private Integer sourceType;
 
     @ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 6 未拉起支付 7 取消")

mec-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrderReturnApply.java

@@ -1,10 +1,13 @@
 package com.yonge.cooleshow.mbg.model;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+@Data
 public class OmsOrderReturnApply implements Serializable {
     private Long id;
 
@@ -94,283 +97,4 @@ public class OmsOrderReturnApply implements Serializable {
 
     private BigDecimal precisionAmount;
 
-    private static final long serialVersionUID = 1L;
-
-    public BigDecimal getPrecisionAmount() {
-        return precisionAmount;
-    }
-
-    public void setPrecisionAmount(BigDecimal precisionAmount) {
-        this.precisionAmount = precisionAmount;
-    }
-
-    public Long getOrderItemId() {
-        return orderItemId;
-    }
-
-    public void setOrderItemId(Long orderItemId) {
-        this.orderItemId = orderItemId;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
-    public Long getCompanyAddressId() {
-        return companyAddressId;
-    }
-
-    public void setCompanyAddressId(Long companyAddressId) {
-        this.companyAddressId = companyAddressId;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public String getOrderSn() {
-        return orderSn;
-    }
-
-    public void setOrderSn(String orderSn) {
-        this.orderSn = orderSn;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getMemberUsername() {
-        return memberUsername;
-    }
-
-    public void setMemberUsername(String memberUsername) {
-        this.memberUsername = memberUsername;
-    }
-
-    public BigDecimal getReturnAmount() {
-        return returnAmount;
-    }
-
-    public void setReturnAmount(BigDecimal returnAmount) {
-        this.returnAmount = returnAmount;
-    }
-
-    public String getReturnName() {
-        return returnName;
-    }
-
-    public void setReturnName(String returnName) {
-        this.returnName = returnName;
-    }
-
-    public String getReturnPhone() {
-        return returnPhone;
-    }
-
-    public void setReturnPhone(String returnPhone) {
-        this.returnPhone = returnPhone;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getHandleTime() {
-        return handleTime;
-    }
-
-    public void setHandleTime(Date handleTime) {
-        this.handleTime = handleTime;
-    }
-
-    public String getProductPic() {
-        return productPic;
-    }
-
-    public void setProductPic(String productPic) {
-        this.productPic = productPic;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getProductBrand() {
-        return productBrand;
-    }
-
-    public void setProductBrand(String productBrand) {
-        this.productBrand = productBrand;
-    }
-
-    public String getProductAttr() {
-        return productAttr;
-    }
-
-    public void setProductAttr(String productAttr) {
-        this.productAttr = productAttr;
-    }
-
-    public Integer getProductCount() {
-        return productCount;
-    }
-
-    public void setProductCount(Integer productCount) {
-        this.productCount = productCount;
-    }
-
-    public BigDecimal getProductPrice() {
-        return productPrice;
-    }
-
-    public void setProductPrice(BigDecimal productPrice) {
-        this.productPrice = productPrice;
-    }
-
-    public BigDecimal getProductRealPrice() {
-        return productRealPrice;
-    }
-
-    public void setProductRealPrice(BigDecimal productRealPrice) {
-        this.productRealPrice = productRealPrice;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getProofPics() {
-        return proofPics;
-    }
-
-    public void setProofPics(String proofPics) {
-        this.proofPics = proofPics;
-    }
-
-    public String getHandleNote() {
-        return handleNote;
-    }
-
-    public void setHandleNote(String handleNote) {
-        this.handleNote = handleNote;
-    }
-
-    public String getHandleMan() {
-        return handleMan;
-    }
-
-    public void setHandleMan(String handleMan) {
-        this.handleMan = handleMan;
-    }
-
-    public String getReceiveMan() {
-        return receiveMan;
-    }
-
-    public void setReceiveMan(String receiveMan) {
-        this.receiveMan = receiveMan;
-    }
-
-    public Date getReceiveTime() {
-        return receiveTime;
-    }
-
-    public void setReceiveTime(Date receiveTime) {
-        this.receiveTime = receiveTime;
-    }
-
-    public String getReceiveNote() {
-        return receiveNote;
-    }
-
-    public void setReceiveNote(String receiveNote) {
-        this.receiveNote = receiveNote;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", orderId=").append(orderId);
-        sb.append(", companyAddressId=").append(companyAddressId);
-        sb.append(", productId=").append(productId);
-        sb.append(", orderSn=").append(orderSn);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", memberUsername=").append(memberUsername);
-        sb.append(", returnAmount=").append(returnAmount);
-        sb.append(", returnName=").append(returnName);
-        sb.append(", returnPhone=").append(returnPhone);
-        sb.append(", status=").append(status);
-        sb.append(", handleTime=").append(handleTime);
-        sb.append(", productPic=").append(productPic);
-        sb.append(", productName=").append(productName);
-        sb.append(", productBrand=").append(productBrand);
-        sb.append(", productAttr=").append(productAttr);
-        sb.append(", productCount=").append(productCount);
-        sb.append(", productPrice=").append(productPrice);
-        sb.append(", productRealPrice=").append(productRealPrice);
-        sb.append(", reason=").append(reason);
-        sb.append(", description=").append(description);
-        sb.append(", proofPics=").append(proofPics);
-        sb.append(", handleNote=").append(handleNote);
-        sb.append(", handleMan=").append(handleMan);
-        sb.append(", receiveMan=").append(receiveMan);
-        sb.append(", receiveTime=").append(receiveTime);
-        sb.append(", receiveNote=").append(receiveNote);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public String getDeliverySn() {
-        return deliverySn;
-    }
-
-    public void setDeliverySn(String deliverySn) {
-        this.deliverySn = deliverySn;
-    }
 }

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/open/OpenShareController.java

@@ -76,7 +76,7 @@ public class OpenShareController extends BaseController {
     @ApiOperation("获取前台商品详情")
     @RequestMapping(value = "/product/detail/{id}", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<PmsPortalProductDetail> detail(@PathVariable Long id) {
+    public CommonResult<PmsPortalProductDetail> detail(@PathVariable Long id,@RequestParam String productSn) {
         PmsPortalProductDetail productDetail = portalProductService.detail(id);
         return CommonResult.success(productDetail);
     }

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/task/OrderTimeOutCancelTask.java

@@ -28,8 +28,8 @@ public class OrderTimeOutCancelTask extends BaseController {
      */
     @GetMapping("/cancelTimeOutOrder")
     public HttpResponseResult cancelTimeOutOrder(){
-        Integer count = portalOrderService.cancelTimeOutOrder();
-        LOGGER.info("取消订单，并根据sku编号释放锁定库存，取消订单数量：{}",count);
+//        Integer count = portalOrderService.cancelTimeOutOrder();
+//        LOGGER.info("取消订单，并根据sku编号释放锁定库存，取消订单数量：{}",count);
         return succeed();
     }