上朵年货节

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/festivalHelpMapper.xml

@@ -34,6 +34,7 @@
                 AND t.festival_help_open_id = #{festivalHelpOpenId}
             </if >
         </where>
+        ORDER BY festival_help_id
     </select>
 
     <select id="getFestivalHelpCount" resultType="Integer" parameterType="Integer" >

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -278,10 +278,10 @@ public class OrderHandler {
 			}else{
 				if(activityDate.isStatus()){
 					/*满减*/
-					Integer promotionAmout = fullReduc(activityDate,cartDtos);;	//促销之后的金额 -- 总金额减去满减，满减的优先级高一些
+					Integer promotionAmout = fullReduc(activityDate,tempCarts);;	//促销之后的金额 -- 总金额减去满减，满减的优先级高一些
 
 					//满赠
-					giftCart(cartDtos);
+					giftCart(tempCarts);
 				}
 			}
 			dto.setActivityDate(activityDate);