Ver código fonte

优化代码

java110 5 anos atrás
pai
commit
98846ad54b

+ 21 - 22
java110-db/src/main/resources/mapper/goods/StoreOrderServiceDaoImplMapper.xml

@@ -19,7 +19,7 @@
     <select id="getStoreOrderInfo" parameterType="Map" resultType="Map">
         select t.person_name,t.person_name personName,t.ext_order_id,t.ext_order_id extOrderId,t.order_id,t.order_id
         orderId,t.total_price,t.total_price totalPrice,t.pay_price,t.pay_price payPrice,t.person_id,t.person_id
-        personId,t.remark,t.status_cd,t.status_cd statusCd,t.o_id,t.o_id oId,t.state,t.freight_price,t.freight_price
+        personId,t.remark,t.status_cd,t.o_id,t.o_id oId,t.state,t.freight_price,t.freight_price
         freightPrice
         from store_order t
         where 1 =1
@@ -44,9 +44,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
+
         <if test="oId !=null and oId != ''">
             and t.o_id= #{oId}
         </if>
@@ -66,39 +64,42 @@
 
     <!-- 修改购物车信息 add by wuxw 2018-07-03 -->
     <update id="updateStoreOrderInfo" parameterType="Map">
-        update store_order t set t.status_cd = #{statusCd}
-
+        update store_order t
+        <set>
         <if test="personName !=null and personName != ''">
-            , t.person_name= #{personName}
+             t.person_name= #{personName},
         </if>
         <if test="extOrderId !=null and extOrderId != ''">
-            , t.ext_order_id= #{extOrderId}
+             t.ext_order_id= #{extOrderId},
         </if>
         <if test="totalPrice !=null and totalPrice != ''">
-            , t.total_price= #{totalPrice}
+             t.total_price= #{totalPrice},
         </if>
         <if test="payPrice !=null and payPrice != ''">
-            , t.pay_price= #{payPrice}
-        </if>
-        <if test="personId !=null and personId != ''">
-            , t.person_id= #{personId}
+             t.pay_price= #{payPrice},
         </if>
+
         <if test="remark !=null and remark != ''">
-            , t.remark= #{remark}
-        </if>
-        <if test="oId !=null and oId != ''">
-            , t.o_id= #{oId}
+             t.remark= #{remark},
         </if>
+
         <if test="state !=null and state != ''">
-            , t.state= #{state}
+             t.state= #{state},
         </if>
         <if test="freightPrice !=null and freightPrice != ''">
-            , t.freight_price= #{freightPrice}
+            t.freight_price= #{freightPrice},
         </if>
+        </set>
         where 1=1
         <if test="orderId !=null and orderId != ''">
             and t.order_id= #{orderId}
         </if>
+        <if test="oId !=null and oId != ''">
+            t.o_id= #{oId},
+        </if>
+        <if test="personId !=null and personId != ''">
+            t.person_id= #{personId},
+        </if>
 
     </update>
 
@@ -128,9 +129,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
+
         <if test="oId !=null and oId != ''">
             and t.o_id= #{oId}
         </if>

+ 1 - 1
service-front/src/main/resources/wechatAuth.properties

@@ -7,7 +7,7 @@ java110.auth.wechat.mchId=mchId
 java110.auth.wechat.wxPayUnifiedOrder=https://api.mch.weixin.qq.com/pay/unifiedorder
 java110.auth.wechat.wxNotifyUrl=https://app.demo.winqi.cn/app/payment/notify
 java110.auth.wechat.rentingNotifyUrl=https://app.demo.winqi.cn/app/payment/rentingNotify
-java110.auth.wechat.goodsNotifyUrl=https://app.demo.winqi.cn/app/goods/notify
+java110.auth.wechat.goodsNotifyUrl=https://app.demo.winqi.cn/goods/notify
 java110.auth.wechat.oweFeeNotifyUrl=https://app.demo.winqi.cn/app/payment/oweFeeNotify
 
 # ¹«ÖÚºÅÐÅÏ¢