|
|
@@ -23,6 +23,7 @@ import com.zskk.shop.controller.bean.ControllerResult;
|
|
|
import com.zskk.shop.controller.bean.UserBean;
|
|
|
import com.zskk.shop.dao.entry.BuyOrder;
|
|
|
import com.zskk.shop.dao.entry.BuyOrderItem;
|
|
|
+import com.zskk.shop.dao.entry.FamilyPeople;
|
|
|
import com.zskk.shop.dao.entry.GoodBase;
|
|
|
import com.zskk.shop.dao.entry.GoodPrice;
|
|
|
import com.zskk.shop.exception.ErrorConstant;
|
|
|
@@ -30,7 +31,9 @@ import com.zskk.shop.exception.ZSKKException;
|
|
|
import com.zskk.shop.service.BuyOrderService;
|
|
|
import com.zskk.shop.service.FamilyPeopleService;
|
|
|
import com.zskk.shop.service.GoodService;
|
|
|
+import com.zskk.shop.service.TJCenterService;
|
|
|
import com.zskk.shop.service.UserCenterService;
|
|
|
+import com.zskk.shop.service.beans.TjOrder;
|
|
|
|
|
|
@Controller
|
|
|
@RequestMapping("/h5/buy")
|
|
|
@@ -48,6 +51,9 @@ public class H5BuyOrderController extends AbstractController{
|
|
|
@Autowired
|
|
|
private FamilyPeopleService familyPeopleService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TJCenterService tjCenterService;
|
|
|
+
|
|
|
/**
|
|
|
* 购买
|
|
|
* @param gid
|
|
|
@@ -122,6 +128,26 @@ public class H5BuyOrderController extends AbstractController{
|
|
|
return "/h5/mypayedorders";
|
|
|
}
|
|
|
|
|
|
+ @RequestMapping("/tjorders")
|
|
|
+ public String tjorders(Model model){
|
|
|
+ UserBean userBean = this.getUser();
|
|
|
+ List<TjOrder> orders = null;
|
|
|
+ List<FamilyPeople> peoples = familyPeopleService.queryMyPeoples(userBean.getUserid());
|
|
|
+ if (peoples.isEmpty()){
|
|
|
+ orders = new ArrayList<>(0);
|
|
|
+ }else{
|
|
|
+ List<String> phones = new ArrayList<>(peoples.size());
|
|
|
+ for (FamilyPeople p:peoples){
|
|
|
+ phones.add(p.getPhone());
|
|
|
+ }
|
|
|
+ phones.add(userBean.getPhone());
|
|
|
+ orders = tjCenterService.getTJOrders(userBean.getUserid(), phones);
|
|
|
+ }
|
|
|
+ model.addAttribute("orders", orders);
|
|
|
+ this.initUser(model);
|
|
|
+ return "/h5/query_report";
|
|
|
+ }
|
|
|
+
|
|
|
@RequestMapping("/completedorders")
|
|
|
public String completedorders(Model model){
|
|
|
UserBean userBean = this.getH5User().getUser();
|
yuhaitao14