Merge remote-tracking branch 'origin/developer' into developerA

src/main/java/com/caimei365/order/model/vo/InvoiceVo.java

@@ -19,6 +19,14 @@ public class InvoiceVo implements Serializable {
      * 用户ID
      */
     private Integer userId;
+    /**
+     * 订单ID
+     */
+    private Integer orderId;
+    /**
+     * 发票类型 0不开发票 1普通发票 2增值税发票
+     */
+    private Integer type;
     /**
      * 发票抬头 个人名称或企业名称或者单位名
      */

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -176,6 +176,7 @@ public class OrderClubServiceImpl implements OrderClubService {
         InvoiceVo invoice = null;
         if (null != order.getInvoiceFlag() && order.getInvoiceFlag() > 0) {
             invoice = orderCommonMapper.getOrderInvoice(orderId);
+            invoice.setUserId(userId);
         }
         // 可用余额
         Double availableMoney = baseMapper.getAbleUserMoney(userId);

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -95,6 +95,8 @@ public class PayOrderServiceImpl implements PayOrderService {
         }
         // 付款金额
         orderCommonService.getDiscernReceiptAndSetOrder(order);
+        map.put("pendingPayments", order.getPendingPayments());
+        map.put("onlinePayFlag", order.getOnlinePayFlag());
         // 商品数据
         List<OrderProductVo> orderProductList = orderCommonMapper.getOrderProductByOrderId(orderId);
         for (OrderProductVo orderProduct : orderProductList) {

src/main/resources/mapper/OrderCommonMapper.xml

@@ -444,6 +444,7 @@
     <select id="getOrderInvoice" resultType="com.caimei365.order.model.vo.InvoiceVo">
         SELECT
             id,
+            type,
             orderId,
             invoiceTitle,
             corporationTaxNum,

src/main/resources/mapper/SubmitMapper.xml

@@ -55,8 +55,8 @@
         WHERE orderID = #{orderId}
     </update>
     <insert id="insertOrderInvoice" parameterType="com.caimei365.order.model.po.InvoicePo">
-        INSERT INTO bp_order_invoice (orderId, invoiceTitle, corporationTaxNum, registeredAddress, registeredPhone, bankAccountNo, openBank)
-        VALUES (#{orderId}, #{invoiceTitle}, #{corporationTaxNum}, #{registeredAddress}, #{registeredPhone}, #{bankAccountNo}, #{openBank})
+        INSERT INTO bp_order_invoice (orderId, invoiceTitle, type, invoiceContent, invoiceTitleType, corporationTaxNum, registeredAddress, registeredPhone, bankAccountNo, openBank)
+        VALUES (#{orderId}, #{invoiceTitle}, #{type},#{invoiceContent},#{invoiceTitleType},#{corporationTaxNum}, #{registeredAddress}, #{registeredPhone}, #{bankAccountNo}, #{openBank})
     </insert>
     <insert id="insertOrderUserInfo" parameterType="com.caimei365.order.model.po.OrderUserInfoPo">
         INSERT INTO bp_order_userinfo (orderId, clubId, userId, name, shouHuoRen, mobile,
@@ -73,8 +73,36 @@
         WHERE userID = #{userId}
     </update>
     <update id="updateOrderInvoice">
-        UPDATE bp_order_invoice SET orderId=#{orderId}, invoiceTitle=#{invoiceTitle}, corporationTaxNum=#{corporationTaxNum},
-            registeredAddress=#{registeredAddress}, registeredPhone=#{registeredPhone}, bankAccountNo=#{bankAccountNo}, openBank=#{openBank}
+        UPDATE bp_order_invoice SET orderId=#{orderId},
+        <set>
+            <if test="invoiceTitle != null">
+                invoiceTitle = #{invoiceTitle},
+            </if>
+            <if test="type != null">
+                type = #{type,jdbcType=CHAR},
+            </if>
+            <if test="invoiceContent != null">
+                invoiceContent = #{invoiceContent},
+            </if>
+            <if test="invoiceTitleType != null">
+                invoiceTitleType = #{invoiceTitleType},
+            </if>
+            <if test="corporationTaxNum != null">
+                corporationTaxNum = #{corporationTaxNum},
+            </if>
+            <if test="registeredAddress != null">
+                registeredAddress = #{registeredAddress},
+            </if>
+            <if test="registeredPhone != null">
+                registeredPhone = #{registeredPhone},
+            </if>
+            <if test="bankAccountNo != null">
+                bankAccountNo = #{bankAccountNo},
+            </if>
+            <if test="openBank != null">
+                openBank = #{openBank},
+            </if>
+        </set>
         WHERE id = #{id}
     </update>
     <select id="getOrderInvoice" resultType="com.caimei365.order.model.po.InvoicePo">