Skip to content

Commit 88dd881

Browse files
author
xiaowei
committed
modify merge
2 parents 20d2e47 + 26ec102 commit 88dd881

22 files changed

Lines changed: 4810 additions & 40366 deletions

‎.classpath‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,18 @@
2020
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2121
<attributes>
2222
<attribute name="maven.pomderived" value="true"/>
23+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2324
</attributes>
2425
</classpathentry>
25-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
26+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
27+
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/libs/pingpp-java-2.0.10.jar">
2628
<attributes>
27-
<attribute name="maven.pomderived" value="true"/>
29+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
30+
</attributes>
31+
</classpathentry>
32+
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/libs/commons-codec-1.10.jar">
33+
<attributes>
34+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2835
</attributes>
2936
</classpathentry>
3037
<classpathentry kind="output" path="target/classes"/>

‎.settings/org.eclipse.core.resources.prefs‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎mybatis.log‎

Lines changed: 4300 additions & 40189 deletions
Large diffs are not rendered by default.

‎src/main/java/com/changyu/foryou/controller/FoodController.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import java.io.File;
44
import java.io.IOException;
55
import java.text.DecimalFormat;
6+
import java.text.ParseException;
7+
import java.text.SimpleDateFormat;
68
import java.util.ArrayList;
79
import java.util.Calendar;
810
import java.util.Date;
@@ -1275,4 +1277,27 @@ public String uploadDetailImageByFoodId(@RequestParam MultipartFile[] detailImag
12751277
return responseMap;
12761278
}
12771279

1280+
@RequestMapping("getTopFive")
1281+
public @ResponseBody Map<String, Object> getTopFive(@RequestParam String dateStart,@RequestParam String dateEnd, Integer page, Integer limit){
1282+
Map<String,Object> requestMap = new HashMap<String, Object>();
1283+
Map<String,Object> responseMap = new HashMap<String, Object>();
1284+
1285+
if(dateStart!=null&&dateEnd!=null){
1286+
try {
1287+
requestMap.put("dateStart", new SimpleDateFormat("yyyy-MM-dd").parse(dateStart));
1288+
requestMap.put("dateEnd", new SimpleDateFormat("yyyy-MM-dd").parse(dateEnd));
1289+
requestMap.put("limit", limit);
1290+
requestMap.put("offset", (page-1)*limit);
1291+
JSONArray hotFive = (JSONArray) JSONArray.toJSON(foodService.getTopFive(requestMap));
1292+
responseMap.put("hotFive", hotFive);
1293+
} catch (ParseException e) {
1294+
// TODO Auto-generated catch block
1295+
e.printStackTrace();
1296+
}
1297+
}
1298+
1299+
/*JSONArray hotFive = (JSONArray) JSONArray.toJSON(foodService.getTopFive(requestMap));
1300+
responseMap.put("hotFive", hotFive);*/
1301+
return responseMap;
1302+
}
12781303
}

‎src/main/java/com/changyu/foryou/controller/OrderController.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.changyu.foryou.model.CartGood;
2828
import com.changyu.foryou.model.DeliverChildOrder;
2929
import com.changyu.foryou.model.DeliverOrder;
30+
import com.changyu.foryou.model.MiniOrder;
3031
import com.changyu.foryou.model.Order;
3132
import com.changyu.foryou.model.PCOrder;
3233
import com.changyu.foryou.model.Preferential;
@@ -205,6 +206,17 @@ public void setOrderService(OrderService orderService) {
205206
togetherOrdersList.add(togetherOrder);
206207
}
207208

209+
List<MiniOrder> statusList = new ArrayList<MiniOrder>();
210+
211+
//根据phoneId获取各个状态订单数量
212+
for (int i = 1; i <= 5; i++) {
213+
MiniOrder order = new MiniOrder();
214+
order.setStatus(Short.parseShort(i+""));
215+
paramMap.put("status", i);
216+
order.setOrderCount(orderService.getMiniOrderByPhone(paramMap));
217+
statusList.add(order);
218+
}
219+
map.put("statusList", statusList);
208220
map.put(Constants.STATUS, Constants.SUCCESS);
209221
map.put(Constants.MESSAGE, "获取订单成功");
210222
map.put("orderList", JSON.parse(JSON

‎src/main/java/com/changyu/foryou/controller/PayController.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ private int doRefundSuccess(String buffer) {
149149
return flag;
150150
}
151151

152+
/**支付成功**/
152153
public int doPaySuccess(String buffer){
153154
Charge charge = (Charge)Webhooks.parseEvnet(buffer);
154155

‎src/main/java/com/changyu/foryou/mapper/FoodMapper.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.apache.ibatis.annotations.Param;
77

88
import com.changyu.foryou.model.Food;
9+
import com.changyu.foryou.model.FoodWithSales;
910
import com.changyu.foryou.model.ShortFood;
1011
import com.changyu.foryou.model.ShortFoodWithIm;
1112
import com.changyu.foryou.model.VeryShortFood;
@@ -45,4 +46,6 @@ public interface FoodMapper {
4546
Integer updateInfoByFoodId(Map<String, Object> paramMap);//更新食品详情图片
4647

4748
Integer cancelRecommend(Map<String, Object> paramMap);//取消推荐
49+
50+
List<FoodWithSales> getTopFive(Map<String, Object> paramMap);
4851
}

‎src/main/java/com/changyu/foryou/mapper/OrderMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66

77
import org.apache.ibatis.annotations.Param;
88

9-
import com.changyu.foryou.model.BigOrder;
109
import com.changyu.foryou.model.CartGood;
1110
import com.changyu.foryou.model.DeliverChildOrder;
1211
import com.changyu.foryou.model.DeliverOrder;
12+
import com.changyu.foryou.model.MiniOrder;
1313
import com.changyu.foryou.model.Order;
1414
import com.changyu.foryou.model.PCOrder;
15-
import com.changyu.foryou.model.Receiver;
1615
import com.changyu.foryou.model.SmallOrder;
1716
import com.changyu.foryou.model.SuperAdminOrder;
1817

@@ -121,4 +120,5 @@ public interface OrderMapper {
121120

122121
Integer updateorderStatusRefundSuccess(Map<String, Object> paramMap); //将状态置为11
123122

123+
Integer getMiniOrderByPhone(Map<String, Object> paramMap); //获取订单状态对应的数量
124124
}

‎src/main/java/com/changyu/foryou/mapping/FoodMapper.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
<id column="food_id" property="foodId" jdbcType="BIGINT" />
4545
<result column="home_image" property="homeImgUrl" jdbcType="VARCHAR" />
4646
</resultMap>
47+
48+
<resultMap type="com.changyu.foryou.model.FoodWithSales" id="FoodWithSalesResultMap">
49+
<id column="food_id" property="foodId" jdbcType="BIGINT"/>
50+
<result column="food_name" property="foodName" jdbcType="VARCHAR"/>
51+
<result column="sales" property="sales" jdbcType="INTEGER"/>
52+
</resultMap>
4753

4854
<sql id="Base_Column_List">
4955
food_id,campus_id, name, price, discount_price, grade,
@@ -498,5 +504,22 @@
498504
</if>
499505
where food_id=#{foodId, jdbcType=BIGINT}
500506
</update>
507+
508+
<select id="getTopFive" resultMap="FoodWithSalesResultMap">
509+
SELECT orders.food_id,food.name as food_name,SUM(orders.order_count) as sales from orders,food
510+
<where>
511+
orders.food_id=food.food_id
512+
<if test="dateStart!=null">
513+
AND together_date BETWEEN #{dateStart,jdbcType=TIMESTAMP}
514+
</if>
515+
<if test="dateEnd!=null">
516+
AND #{dateEnd,jdbcType=TIMESTAMP}
517+
</if>
518+
</where>
519+
GROUP BY food_id ORDER BY SUM(order_count) DESC
520+
<if test="limit != null and offset != null">
521+
limit #{offset,jdbcType=INTEGER},#{limit,jdbcType=INTEGER}
522+
</if>
523+
</select>
501524
</mapper>
502525

‎src/main/java/com/changyu/foryou/mapping/OrderMapper.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,11 @@
963963
update
964964
orders
965965
set status=11
966-
where together_id=#{togetherId,jdbcType=VARCHAR}
966+
where together_id=#{togetherId,jdbcType=VARCHAR}
967967
</update>
968+
969+
<select id="getMiniOrderByPhone" resultType="Integer">
970+
select COUNT(together_id) from orders WHERE together_id in
971+
(select DISTINCT together_id from orders where phone=#{phoneId,jdbcType=VARCHAR} and status=#{status,jdbcType=SMALLINT})
972+
</select>
968973
</mapper>

0 commit comments

Comments
 (0)