Browse Source

代码优化

叶君翔 3 years ago
parent
commit
0fdad22d47

+ 8 - 6
lb-app/src/main/java/com/ydd/app/dto/PushOrderDto.java

@@ -20,6 +20,8 @@ import java.io.Serializable;
 @Accessors(chain = true)
 public class PushOrderDto extends BaseDto implements Serializable {
 
+  private static final long serialVersionUID = 4482372764158072355L;
+
   /** 接入方订单编号(唯一标识),最长不超过32个字符 */
   @NotBlank(message = "接入方订单编号不能为空")
   @ApiModelProperty(required = true, value = "接入方订单编号")
@@ -28,23 +30,23 @@ public class PushOrderDto extends BaseDto implements Serializable {
   /** 物品ID */
   @NotEmpty(message = "物品ID不能为空")
   @ApiModelProperty(required = true, value = "物品ID")
-  private Integer goodsType;
+  private Integer categoryId;
 
   /** 物品重量,单位KG */
   @NotEmpty(message = "物品重量不能为空")
   @ApiModelProperty(required = true, value = "物品重量")
-  private Integer goodsWeight;
+  private Integer weight;
 
   /** 订单备注 */
   @ApiModelProperty(value = "订单备注")
   private String remark;
 
-  /** 收件人名称,最长不超过32个字符 */
+  /** 收件人名称,最长不超过50个字符 */
   @NotBlank(message = "收件人名称不能为空")
   @ApiModelProperty(required = true, value = "收件人名称")
   private String receiverName;
 
-  /** 收件人联系电话,最长不超过20个字符 */
+  /** 收件人联系电话,最长不超过40个字符 */
   @NotBlank(message = "收件人联系电话不能为空")
   @ApiModelProperty(required = true, value = "收件人联系电话")
   private String receiverPhone;
@@ -86,11 +88,11 @@ public class PushOrderDto extends BaseDto implements Serializable {
   @ApiModelProperty(value = "猎豹AI门店编号")
   private String shopCode;
 
-  /** 发件人名称,当传入shopCode门店编号时,不必填,根据门店信息发单,最长不超过32个字符 */
+  /** 发件人名称,当传入shopCode门店编号时,不必填,根据门店信息发单,最长不超过50个字符 */
   @ApiModelProperty(value = "发件人名称")
   private String sendName;
 
-  /** 发件人联系电话,当传入shopCode门店编号时,不必填,根据门店信息发单,最长不超过20个字符 */
+  /** 发件人联系电话,当传入shopCode门店编号时,不必填,根据门店信息发单,最长不超过40个字符 */
   @ApiModelProperty(value = "发件人联系电话")
   private String sendPhone;
 

+ 2 - 2
lb-app/src/main/java/com/ydd/app/service/impl/OpenApiOrderServiceImpl.java

@@ -53,10 +53,10 @@ public class OpenApiOrderServiceImpl implements OpenApiOrderService {
 
         // 添加订单其它属性
         order.setOutTradeNo(orderDto.getOutOrderSn());
-        order.setProductId(orderDto.getGoodsType().longValue());
+        order.setProductId(orderDto.getCategoryId().longValue());
         Product product = iProductService.getById(order.getProductId());
         order.setProductName(product.getName());
-        order.setWeight(orderDto.getGoodsWeight());
+        order.setWeight(orderDto.getWeight());
         if (StringUtils.isNotBlank(orderDto.getRemark())) {
             order.setTakeRemark(orderDto.getRemark());
         }

+ 1 - 1
lb-app/src/main/java/com/ydd/app/service/impl/OpenApiOrderValuationServiceImpl.java

@@ -31,7 +31,7 @@ public class OpenApiOrderValuationServiceImpl implements OpenApiOrderValuationSe
         if (result.getCode() != ResponseResultCodeEnum.SUCCESS.getCode()) {
             return result;
         }
-
+        
         return null;
     }