Merge branch 'test6.9.9' of http://git.yoho.cn/ufo/ufo-platform into test6.9.9

@@ -62,7 +62,7 @@ public class Product {
     
     
     private BigDecimal offerPrice;
     private BigDecimal offerPrice;
 
 
-    private Integer hsCode;
+    private String hsCode;
     private String measuremenCode;
     private String measuremenCode;
     private String barCode;
     private String barCode;
     private String productNameCn;
     private String productNameCn;
@@ -307,11 +307,11 @@ public class Product {
         this.productNameCn = productNameCn;
         this.productNameCn = productNameCn;
     }
     }
 
 
-    public Integer getHsCode() {
+    public String getHsCode() {
         return hsCode;
         return hsCode;
     }
     }
 
 
-    public void setHsCode(Integer hsCode) {
+    public void setHsCode(String hsCode) {
         this.hsCode = hsCode;
         this.hsCode = hsCode;
     }
     }
 
 

@@ -18,7 +18,7 @@ public class ProductAttrImportItem {
     private String productNameCn;
     private String productNameCn;
 
 
     @BatchImportField(index = 3)
     @BatchImportField(index = 3)
-    private Integer hsCode;
+    private String hsCode;
 
 
     @BatchImportField(index = 4)
     @BatchImportField(index = 4)
     private String barCode;
     private String barCode;

@@ -24,7 +24,7 @@
     <result column="age_level" jdbcType="VARCHAR" property="ageLevel" />
     <result column="age_level" jdbcType="VARCHAR" property="ageLevel" />
     <result column="is_syn_calender" jdbcType="INTEGER" property="isSynCalender" />
     <result column="is_syn_calender" jdbcType="INTEGER" property="isSynCalender" />
     <result column="offer_price" jdbcType="DECIMAL" property="offerPrice" />
     <result column="offer_price" jdbcType="DECIMAL" property="offerPrice" />
-    <result column="hs_code" jdbcType="INTEGER" property="hsCode" />
+    <result column="hs_code" jdbcType="VARCHAR" property="hsCode" />
     <result column="measuremen_code" jdbcType="VARCHAR" property="measuremenCode" />
     <result column="measuremen_code" jdbcType="VARCHAR" property="measuremenCode" />
     <result column="bar_code" jdbcType="VARCHAR" property="barCode" />
     <result column="bar_code" jdbcType="VARCHAR" property="barCode" />
     <result column="product_name_cn" jdbcType="VARCHAR" property="productNameCn" />
     <result column="product_name_cn" jdbcType="VARCHAR" property="productNameCn" />
@@ -50,7 +50,7 @@
     <update id="updateAttByPrimaryKey" parameterType="com.yoho.ufo.dal.model.Product">
     <update id="updateAttByPrimaryKey" parameterType="com.yoho.ufo.dal.model.Product">
         update product set
         update product set
         bar_code = #{barCode,jdbcType=VARCHAR},
         bar_code = #{barCode,jdbcType=VARCHAR},
-        hs_code = #{hsCode,jdbcType=INTEGER},
+        hs_code = #{hsCode,jdbcType=VARCHAR},
         product_name_cn = #{productNameCn,jdbcType=VARCHAR},
         product_name_cn = #{productNameCn,jdbcType=VARCHAR},
         measuremen_code = #{measuremenCode,jdbcType=VARCHAR}
         measuremen_code = #{measuremenCode,jdbcType=VARCHAR}
         where id = #{id,jdbcType=INTEGER}
         where id = #{id,jdbcType=INTEGER}

@@ -2932,6 +2932,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
         JSONObject orderCargoObj = new JSONObject();
         JSONObject orderCargoObj = new JSONObject();
         orderCargoObj.put("name", orderInfo.getGoodsInfo());//货物名称
         orderCargoObj.put("name", orderInfo.getGoodsInfo());//货物名称
         orderCargoObj.put("count", 1);//货物数量
         orderCargoObj.put("count", 1);//货物数量
+        orderCargoObj.put("unit", product.getMeasuremenCode());
         orderCargoObj.put("stdUnit", "035");//货品单位
         orderCargoObj.put("stdUnit", "035");//货品单位
         orderCargoObj.put("sku", orderInfo.getSkup());//商品sku
         orderCargoObj.put("sku", orderInfo.getSkup());//商品sku
         orderCargoObj.put("seq", 1);//商品序号seq
         orderCargoObj.put("seq", 1);//商品序号seq
@@ -2944,7 +2945,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
         orderCargoObj.put("brand", brand.getBrandName());//商品品牌
         orderCargoObj.put("brand", brand.getBrandName());//商品品牌
         orderCargoObj.put("regPrice", orderInfo.getGoodsPrice());//商品备案申报价格
         orderCargoObj.put("regPrice", orderInfo.getGoodsPrice());//商品备案申报价格
         orderCargoObj.put("secUnit", "025");//第二计量单位(编码)
         orderCargoObj.put("secUnit", "025");//第二计量单位(编码)
-        orderCargoObj.put("secQty", 1.00000);//第二计量单位 数量*商品数量 5位小数
+        orderCargoObj.put("secQty", BigDecimal.valueOf(1.00000).setScale(5));//第二计量单位 数量*商品数量 5位小数
         orderCargoArr.add(orderCargoObj);
         orderCargoArr.add(orderCargoObj);
         orderListObj.put("cargo", orderCargoArr);
         orderListObj.put("cargo", orderCargoArr);
         jsonObj.put("orderList", orderListArray);
         jsonObj.put("orderList", orderListArray);