Merge branch 'master' of http://git3.nong12.com/xtrade/order-service

yangfan
2 parents 726ccbe4 e15d7f0a
Showing 5 changed files with 233 additions and 225 deletions
src/main/java/com/diligrp/xtrade/order/domain/builder/DefaultOrderCreator.java
src/main/java/com/diligrp/xtrade/order/domain/entity/OrderItemDo.java
src/main/resources/bootstrap.yml
src/main/resources/mapping/com/diligrp/xtrade/order/OrderDao.xml
src/main/resources/mapping/com/diligrp/xtrade/order/OrderItemDao.xml
@@ -88,8 +88,8 @@ public class DefaultOrderCreator {
 		OrderItemDo orderItemDo = new OrderItemDo();
 		orderItemDo.setItemId(itemId);
 		orderItemDo.setOrderId(orderDo.getOrderId());
-		orderItemDo.setProductId(orderItem.getPid());
-		orderItemDo.setProductName(orderItem.getPname());
+		orderItemDo.setPid(orderItem.getPid());
+		orderItemDo.setPname(orderItem.getPname());
 		// 销售单价
 		BigDecimal price = BigDecimal.valueOf(orderItem.getPrice());
 		// 销售数量
-package com.diligrp.xtrade.order.domain.entity;
-
-import com.diligrp.xtrade.shared.domain.BaseDo;
-
-/**
- * 订单详情实体数据
- * @author zhangxing
- *
- */
-public class OrderItemDo extends BaseDo {
-	
-	//订单详情id
-	private Long itemId;
-	
-	//订单id
-	private Long orderId;
-	
-	//商品名称
-	private String productName;
-	
-	//商品id
-	private Long productId;
-	
-	//单价
-	private Integer price;
-	
-	//数量
-	private Double amount;
-	
-	//单位
-	private Integer saleUnit;
-	
-	//件重
-	private Double unitWeight;
-	
-	//卖家佣金
-	private Long scommission;
-	
-	//买家佣金
-	private Long bcommission;
-	
-	//佣金规则
-	private Long ruleId;
-	
-	//费率描述
-	private String ruleRate;
-	
-	//订单详情id
-	private Double weight;
-	
-	//金额
-	private Long money;
-
-	public Long getItemId() {
-		return itemId;
-	}
-
-	public void setItemId(Long itemId) {
-		this.itemId = itemId;
-	}
-
-	public Long getOrderId() {
-		return orderId;
-	}
-
-	public void setOrderId(Long orderId) {
-		this.orderId = orderId;
-	}
-
-	public String getProductName() {
-		return productName;
-	}
-
-	public void setProductName(String productName) {
-		this.productName = productName;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Integer getPrice() {
-		return price;
-	}
-
-	public void setPrice(Integer price) {
-		this.price = price;
-	}
-
-	public Double getAmount() {
-		return amount;
-	}
-
-	public void setAmount(Double amount) {
-		this.amount = amount;
-	}
-
-	public Integer getSaleUnit() {
-		return saleUnit;
-	}
-
-	public void setSaleUnit(Integer saleUnit) {
-		this.saleUnit = saleUnit;
-	}
-
-	public Double getUnitWeight() {
-		return unitWeight;
-	}
-
-	public void setUnitWeight(Double unitWeight) {
-		this.unitWeight = unitWeight;
-	}
-
-	public Long getScommission() {
-		return scommission;
-	}
-
-	public void setScommission(Long scommission) {
-		this.scommission = scommission;
-	}
-
-	public Long getBcommission() {
-		return bcommission;
-	}
-
-	public void setBcommission(Long bcommission) {
-		this.bcommission = bcommission;
-	}
-
-	public Long getRuleId() {
-		return ruleId;
-	}
-
-	public void setRuleId(Long ruleId) {
-		this.ruleId = ruleId;
-	}
-
-	public String getRuleRate() {
-		return ruleRate;
-	}
-
-	public void setRuleRate(String ruleRate) {
-		this.ruleRate = ruleRate;
-	}
-
-	public Double getWeight() {
-		return weight;
-	}
-
-	public void setWeight(Double weight) {
-		this.weight = weight;
-	}
-
-	public Long getMoney() {
-		return money;
-	}
-
-	public void setMoney(Long money) {
-		this.money = money;
-	}
-
-}
+package com.diligrp.xtrade.order.domain.entity;
+
+import com.diligrp.xtrade.shared.domain.BaseDo;
+
+/**
+ * 订单详情实体数据
+ * @author zhangxing
+ *
+ */
+public class OrderItemDo extends BaseDo {
+	
+	//订单详情id
+	private Long itemId;
+	
+	//订单id
+	private Long orderId;
+	
+	//商品名称
+	private String pname;
+	
+	//商品id
+	private Long pid;
+	
+	//单价
+	private Integer price;
+	
+	//数量
+	private Double amount;
+	
+	//单位
+	private Integer saleUnit;
+	
+	//件重
+	private Double unitWeight;
+	
+	//卖家佣金
+	private Long scommission;
+	
+	//买家佣金
+	private Long bcommission;
+	
+	//佣金规则
+	private Long ruleId;
+	
+	//费率描述
+	private String ruleRate;
+	
+	//订单详情id
+	private Double weight;
+	
+	//金额
+	private Long money;
+
+	public Long getItemId() {
+		return itemId;
+	}
+
+	public void setItemId(Long itemId) {
+		this.itemId = itemId;
+	}
+
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
+	public Integer getPrice() {
+		return price;
+	}
+
+	public void setPrice(Integer price) {
+		this.price = price;
+	}
+
+	public Double getAmount() {
+		return amount;
+	}
+
+	public void setAmount(Double amount) {
+		this.amount = amount;
+	}
+
+	public Integer getSaleUnit() {
+		return saleUnit;
+	}
+
+	public void setSaleUnit(Integer saleUnit) {
+		this.saleUnit = saleUnit;
+	}
+
+	public Double getUnitWeight() {
+		return unitWeight;
+	}
+
+	public void setUnitWeight(Double unitWeight) {
+		this.unitWeight = unitWeight;
+	}
+
+	public Long getScommission() {
+		return scommission;
+	}
+
+	public void setScommission(Long scommission) {
+		this.scommission = scommission;
+	}
+
+	public Long getBcommission() {
+		return bcommission;
+	}
+
+	public void setBcommission(Long bcommission) {
+		this.bcommission = bcommission;
+	}
+
+	public Long getRuleId() {
+		return ruleId;
+	}
+
+	public void setRuleId(Long ruleId) {
+		this.ruleId = ruleId;
+	}
+
+	public String getRuleRate() {
+		return ruleRate;
+	}
+
+	public void setRuleRate(String ruleRate) {
+		this.ruleRate = ruleRate;
+	}
+
+	public Double getWeight() {
+		return weight;
+	}
+
+	public void setWeight(Double weight) {
+		this.weight = weight;
+	}
+
+	public Long getMoney() {
+		return money;
+	}
+
+	public void setMoney(Long money) {
+		this.money = money;
+	}
+
+	public String getPname() {
+		return pname;
+	}
+
+	public void setPname(String pname) {
+		this.pname = pname;
+	}
+
+	public Long getPid() {
+		return pid;
+	}
+
+	public void setPid(Long pid) {
+		this.pid = pid;
+	}
+
+}
@@ -29,7 +29,7 @@ mybatis:
     configuration:
       map-underscore-to-camel-case: true
       cache-enabled: true
-    mapper-locations: classpath:mapping/com/diligrp/xtrade/*product/*Dao.xml
+    mapper-locations: classpath:mapping/com/diligrp/xtrade/*/*Dao.xml
     type-aliases-package: com.diligrp.xtrade.*.domain.entity
 #logging:
 #  level:
@@ -64,29 +64,29 @@
 	</select>
 	<update id="updateBuyerInfo">
-		UPDATE xt_order
+		<![CDATA[UPDATE xt_order
 		SET baccount = #{baccount},bcard_no = #{bcardNo},
 		bcard_type =#{bcardType},bname = #{bname},
 		bmobile = #{bmobile},modified_time =now()
-		WHERE order_id=#{orderId}
+		WHERE order_id=#{orderId}]]>
 	</update>
-	
+
 	<update id="finishPayment">
-		UPDATE xt_order
+		<![CDATA[UPDATE xt_order
 		SET order_status = 3, pay_type  = #{payType},
 		pay_src  = #{paySrc}, pay_time = now(), modified_time = now()
-		WHERE order_id=#{orderId}
+		WHERE order_id=#{orderId}]]>
 	</update>
-	
+
 	<update id="updateCommission">
-		UPDATE xt_order SET scommission = #{scommission}, bcommission = #{bcommission}, modified_time = now()
-		WHERE order_id=#{orderId}
+		<![CDATA[UPDATE xt_order SET scommission = #{scommission}, bcommission = #{bcommission}, modified_time = now()
+		WHERE order_id=#{orderId}]]>
 	</update>
-	
+
 	<update id="updateOrderStatus">
-		UPDATE xt_order
+		<![CDATA[UPDATE xt_order
 		SET order_status = #{orderStatus}, modified_time = now()
-		WHERE order_id=#{orderId}
+		WHERE order_id=#{orderId}]]>
 	</update>
 </mapper>
 \ No newline at end of file
@@ -2,62 +2,70 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diligrp.xtrade.order.dao.OrderItemDao">
-    <sql id="QUERY_COLUMN_LIST">
+	<sql id="QUERY_COLUMN_LIST">
 		<![CDATA[
-        `item_id` AS itemId, `order_id` AS orderId, `product_name` AS productName, `product_id` AS productId, `cate_id` AS cateId,  `cate_name` AS cateName, `price`, `amount`, `sale_unit` AS saleUnit, `unit_weight` AS unitWeight, `scommission`, `bcommission`, `rule_id` ruleId, `rule_rate` ruleRate, `weight`, `total_money` AS totalMoney
+        `item_id` AS itemId, `order_id` AS orderId, `pname` AS pname, `pid` AS pid, `cate_id` AS cateId,  `cate_name` AS cateName, `price`, `amount`, `sale_unit` AS saleUnit, `unit_weight` AS unitWeight, `scommission`, `bcommission`, `rule_id` ruleId, `rule_rate` ruleRate, `weight`, `total_money` AS totalMoney
         ]]>
 	</sql>
-    <insert id="insertEntity">
-        INSERT INTO `xt_order_item`(`item_id`, `order_id`, `product_name`, `product_id`, `price`, `amount`, `sale_unit`,
-                                    `unit_weight`, `scommission`, `bcommission`, `rule_id`, `rule_rate`, `weight`, `total_money`,
-                                    `created_time`, `modified_time`)
-        VALUES (#{itemId}, #{orderId}, #{productName}, #{productId}, #{price}, #{amount}, #{saleUnit}, #{unitWeight},
-                #{scommission}, #{bcommission}, #{ruleid}, #{ruleRate}, #{}weight, #{totalMoney}, NOW(), NOW());
-    </insert>
-    <insert id="insertBatch" parameterType="java.util.List">
-        INSERT INTO xt_order_item(item_id, order_id, product_name, product_id, cate_id, cate_name, price, amount, sale_unit,
-        unit_weight, scommission, bcommission, rule_id, rule_rate, weight, total_money, created_time, modified_time)
-        VALUES
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            #{item.itemId},
-            #{item.orderId},
-            #{item.productName},
-            #{item.productId},
-            null,
-            null,
-            #{item.price},
-            #{item.amount},
-            #{item.saleUnit},
-            #{item.unitWeight},
+	<insert id="insertEntity" parameterType="orderItemDo">
+		INSERT INTO `xt_order_item`(`item_id`, `order_id`, `pname`,
+		`pid`, `price`, `amount`, `sale_unit`,
+		`unit_weight`, `scommission`, `bcommission`, `rule_id`, `rule_rate`, `weight`,
+		`total_money`,
+		`created_time`, `modified_time`)
+		VALUES (#{itemId}, #{orderId}, #{pname}, #{pid}, #{price},
+		#{amount}, #{saleUnit}, #{unitWeight},
+		#{scommission}, #{bcommission}, #{ruleid}, #{ruleRate}, #{weight}, #{totalMoney},
+		NOW(), NOW());
+	</insert>
+	<insert id="insertBatch" parameterType="java.util.List">
+		INSERT INTO xt_order_item(item_id, order_id, pname, pid,
+		cate_id, cate_name, price, amount, sale_unit,
+		unit_weight, scommission, bcommission, rule_id, rule_rate, weight, total_money,
+		created_time, modified_time)
+		VALUES
+		<foreach collection="list" item="item" index="index"
+			separator=",">
+			(
+			#{item.itemId},
+			#{item.orderId},
+			#{item.pname},
+			#{item.pid},
+			null,
+			null,
+			#{item.price},
+			#{item.amount},
+			#{item.saleUnit},
+			#{item.unitWeight},
 			#{item.scommission},
 			#{item.bcommission},
 			#{item.ruleId},
 			#{item.ruleRate},
 			#{item.weight},
 			#{item.money},
-            now(),
-            now()
-            )
-        </foreach>
-    </insert>
+			now(),
+			now()
+			)
+		</foreach>
+	</insert>
-    <select id="selectItemsByOrderId" parameterType="long" resultType="orderItemDo">
-        SELECT
-        <include refid="QUERY_COLUMN_LIST"/>
-        FROM `xt_order_item`
-        WHERE item_id =#{itemId}
-    </select>
+	<select id="selectItemsByOrderId" parameterType="long"
+		resultType="orderItemDo">
+		SELECT
+		<include refid="QUERY_COLUMN_LIST" />
+		FROM `xt_order_item`
+		WHERE order_id =#{orderId}
+	</select>
-    <update id="updateCommission">
-        UPDATE `xt_order_item`
-        SET `scommission`=#{scommission},
-            `bcommission`=#{bcommission},
-            `rule_id`=#{ruleId},
-            `rule_rate`=#{ruleRate},
-            modified_time = NOW()
-        WHERE item_id = #{itemId}
-    </update>
+	<update id="updateCommission">
+		UPDATE `xt_order_item`
+		SET `scommission`=#{scommission},
+		`bcommission`=#{bcommission},
+		`rule_id`=#{ruleId},
+		`rule_rate`=#{ruleRate},
+		modified_time = NOW()
+		WHERE item_id = #{itemId}
+	</update>
 </mapper>