Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderInvoice.java

@@ -100,14 +100,14 @@ public class OrderInvoice {
     /**
      * 创建者id
      */
-    @Column(name = "crt_user")
-    private Integer crtUser;
+    @Column(name = "user_id")
+    private Integer userId;
 
     /**
      * 更新者id
      */
-    @Column(name = "upd_user")
-    private Integer updUser;
+    @Column(name = "user_upd")
+    private Integer userUpd;
 
     /**
      * 更多内容

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java

@@ -60,7 +60,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 				//查询是否已开票
 				OrderInvoice oldValue = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderId)).getData();
 				if (oldValue == null) { //不存在就添加
-					orderInvoice.setCrtUser(appUserDTO.getUserid());
+					orderInvoice.setUserId(appUserDTO.getUserid());
 					insertSelectiveRe(orderInvoice);
 					log.info("添加发票记录成功: {}", orderInvoice);
 					OrderInvoice newValue = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderId)).getData();
@@ -116,7 +116,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
 		}
 		Example example = new Example(OrderInvoice.class);
-		example.createCriteria().andEqualTo("crtUser", appUserDTO.getUserid());
+		example.createCriteria().andEqualTo("userId", appUserDTO.getUserid());
 		if (type != null) {
 			example.createCriteria().andEqualTo("type", type);
 		}
@@ -130,7 +130,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 	 */
 	public ObjectRestResponse<List<OrderInvoice>> selectByUserId(Integer userId, Integer type) {
 		Example example = new Example(OrderInvoice.class);
-		example.createCriteria().andEqualTo("crtUser", userId);
+		example.createCriteria().andEqualTo("userId", userId);
 		if (type != null) {
 			example.createCriteria().andEqualTo("type", type);
 		}
@@ -140,7 +140,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 	public ObjectRestResponse<OrderInvoice> selectByUserIdAndOrderId(Integer userId, Integer orderId) {
 
 		return ObjectRestResponse.succ(mapper.selectByUserIdAndOrderId(new OrderInvoice(){{
-			setCrtUser(userId);
+			setUserId(userId);
 			setOrderIds(orderId + "");
 		}}));
 	}

xx-order/xx-order-server/src/main/resources/mapper/OrderInvoiceMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.order.mapper.OrderInvoiceMapper" >
     <select id="selectByUserIdAndOrderId" parameterType="com.xxfc.platform.order.entity.OrderInvoice" resultType="com.xxfc.platform.order.entity.OrderInvoice">
-        select * from order_e_invoice where crt_user = #{crtUser} and order_ids like concat("%", #{orderIds}, "%")
+        select * from order_e_invoice where user_id = #{userId} and order_ids like concat("%", #{orderIds}, "%")
     </select>
 </mapper>
\ No newline at end of file