From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 150 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 138 insertions(+), 12 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 7c36464..d488504 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -14,6 +14,9 @@
import com.dsh.course.feignClient.activity.PointMercharsClient;
import com.dsh.course.feignClient.activity.model.*;
import com.dsh.course.feignClient.course.CourseClient;
+import com.dsh.course.feignClient.course.CoursePackageClient;
+import com.dsh.course.feignClient.course.model.CoursePackagePaymentConfig;
+import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.ErrorTip;
@@ -51,6 +54,7 @@
private String PREFIX = "/system/tGoods/";
+ private String PREFIX1 = "/system/tGoodsAudit/";
@Resource
@@ -72,6 +76,8 @@
@Autowired
private CourseClient courseClient;
+ @Autowired
+ private CoursePackageClient coursePackageClient;
@Resource
private PointMercharsClient pointMercharsClient;
@@ -85,6 +91,11 @@
public String index(Model model) {
return PREFIX + "TGoods.html";
+ }
+ @RequestMapping("/audit")
+ public String audit(Model model) {
+
+ return PREFIX1 + "TGoodsAudit.html";
}
/**
@@ -132,10 +143,10 @@
Integer coursePackageId = pointMercharsVo.getCoursePackageId();
List<String> name = courseClient.queryPackageById(coursePackageId);
Integer coursePackageId1 = pointMercharsVo.getCoursePackageId();
- String classHours = courseClient.getHours(coursePackageId1);
+ List<CoursePackagePaymentConfig> hoursByPackageId = courseClient.getHoursByPackageId(coursePackageId1);
model.addAttribute("typeName",name.get(0));
model.addAttribute("pageName",name.get(1));
- model.addAttribute("classHours",classHours);
+ model.addAttribute("classHours",hoursByPackageId);
String productImages = pointMercharsVo.getProductImages();
ArrayList<String> strings = new ArrayList<>();
for (String s : productImages.split(",")) {
@@ -153,7 +164,7 @@
List<StoreVos> provinces = pointMercharsClient.getProvinces(id);
model.addAttribute("city",provinces);
}
- if (infoOneVo.getUseScope() == 2){
+ if (infoOneVo.getUseScope() == 3){
List<StoreVos> storeVos = pointMercharsClient.getStoreList(id);
model.addAttribute("store",storeVos);
}
@@ -240,7 +251,20 @@
*/
@RequestMapping("/storeList")
public String storePage(Model model) {
+ List<TCity> provinceList = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",provinceList);
return PREFIX + "TStoreList.html";
+ }
+
+
+ /**
+ * 跳转到门店管理列表页
+ */
+ @RequestMapping("/storeList1")
+ public String storePage1(Model model) {
+ List<TCity> provinceList = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",provinceList);
+ return PREFIX + "TStoreListOne.html";
}
@RequestMapping("/updateType")
@ResponseBody
@@ -392,6 +416,7 @@
stringObjectHashMap.put("cover",cover);
stringObjectHashMap.put("productImages",productImages);
stringObjectHashMap.put("sort",sort);
+ stringObjectHashMap.put("type",UserExt.getUser().getObjectType());
System.out.println(stringObjectHashMap);
pointMercharsClient.updateGoodsDetail(stringObjectHashMap);
return new SuccessTip<>();
@@ -426,6 +451,26 @@
Double price,Integer type,Integer integral,Double cash,String cover,String imgOne,Integer userPopulation,Integer quantityIssued,Integer pickUpQuantity,
String startTime,String text,Integer sort,String name,Integer useScope,String cityIds,String storeIds,Integer cardType
) throws ParseException {
+ // 判断当前选择的课包 是不是假期课 然后判断选择的有效期是否在假期课有效期内
+ if (coursePackageId!=null){
+ TCoursePackage tCoursePackage = coursePackageClient.queryById(coursePackageId);
+ if (tCoursePackage.getType()==2){
+ // 如果是假期课 获取到当前课包的开始时间和结束时间
+ Date endTime = tCoursePackage.getEndTime();
+ Date startTime1 = tCoursePackage.getStartTime();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date s = format.parse(startTime.split(" - ")[0]);
+ Date e = format.parse(startTime.split(" - ")[1]);
+ if (s.before(startTime1)){
+ // 有效期开始时间小于假期课开始时间
+ return 5009;
+ }
+ if (e.after(endTime)){
+ // 有效期结束时间大于假期课结束时间
+ return 5008;
+ }
+ }
+ }
PointsMerchandise pointsMerchandise = new PointsMerchandise();
pointsMerchandise.setType(typeAll);
pointsMerchandise.setName(name);
@@ -463,9 +508,11 @@
pointsMerchandise.setState(1);
pointsMerchandise.setInsertTime(new Date());
pointsMerchandise.setCoursePackageConfigId(coursePackageConfigId);
+ if(UserExt.getUser().getObjectType()!=1){
+ pointsMerchandise.setStatus(2);
+ }
// 代替storeId
- pointsMerchandise.setShelves(storeId);
- Integer id = pointMercharsClient.add(pointsMerchandise);
+ pointsMerchandise.setShelves(1);
if(typeAll!=2){
if(useScope==2){
ArrayList<Map<String,String>> objects = new ArrayList<>();
@@ -477,11 +524,27 @@
map.put("pCode",pCity.getCode());
map.put("cName",tCity.getName());
map.put("cCode",tCity.getCode());
- map.put("id",id.toString());
+ map.put("id","0");
objects.add(map);
}
pointMercharsClient.addCitys(objects);
}else if(useScope==3){
+ if(UserExt.getUser().getObjectType()==3){
+ storeIds=UserExt.getUser().getObjectId().toString();
+ }
+ Integer oid=null;
+ String[] split = storeIds.split(",");
+ for (int i = 0; i < split.length; i++) {
+ if(i==0){
+ Integer operatorId = storeService.getById(split[0]).getOperatorId();
+ oid=operatorId;
+ }
+ Integer operatorId = storeService.getById(split[i]).getOperatorId();
+ if(oid!=operatorId){
+ return "5003";
+ }
+ }
+ Integer id = pointMercharsClient.add(pointsMerchandise);
String pam = id+"_"+storeIds;
// 添加多个城市 门店
try{
@@ -490,7 +553,15 @@
}catch (Exception e){
e.printStackTrace();
}
+ }else if(useScope==1){
+ Integer id = pointMercharsClient.add(pointsMerchandise);
}
+ }else {
+ // ?
+ pointsMerchandise.setShelves(storeId);
+ pointsMerchandise.setUseScope(3);
+
+ Integer id = pointMercharsClient.add(pointsMerchandise);
}
return new SuccessTip<>();
@@ -516,6 +587,33 @@
System.out.println(ofSearch);
return pointMercharsClient.getIntegralGoodsListOfSearch(ofSearch);
}
+ @RequestMapping(value = "/listAudit")
+ @ResponseBody
+ public Object listOfIntegralGoodsAudit(String name, Integer type, Integer redemptionMethod , Integer userPopulation, Integer activeStatus) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ IntegralGoodsOfSearch ofSearch = new IntegralGoodsOfSearch();
+ ofSearch.setPage(page);
+ ofSearch.setName(name);
+ ofSearch.setType(type);
+ ofSearch.setRedemptionMethod(redemptionMethod);
+ ofSearch.setUserPopulation(userPopulation);
+ ofSearch.setActiveStatus(activeStatus);
+ return pointMercharsClient.getIntegralGoodsListOfSearchAudit(ofSearch);
+ }
+
+
+
+
+
+
+
+
+ @RequestMapping(value = "/updateTypeOne")
+ @ResponseBody
+ public Object updateTypeOne(Integer id, Integer type, String remark) {
+ Object o = pointMercharsClient.updateType(id + "_" + type + "_" + remark);
+ return SUCCESS_TIP;
+ }
@@ -526,13 +624,21 @@
public String tCityUpdate(@PathVariable Integer id, Model model) {
System.out.println("id:"+id);
PointMercharsVo pointMercharsVo = pointMercharsClient.queryPointMerchaseDetailOfId(id);
+
System.out.println("pointMercharsVo:"+pointMercharsVo);
String[] split = pointMercharsVo.getPics().split(",");
- List<String> list = Arrays.asList(split);
+ StringBuilder concatenatedString = new StringBuilder();
+ for (String element : split) {
+ concatenatedString.append(element).append(",");
+ }
+ // 去除末尾的逗号
+ if (concatenatedString.length() > 0) {
+ concatenatedString.setLength(concatenatedString.length() - 1);
+ }
+ String result = concatenatedString.toString();
model.addAttribute("id",id);
model.addAttribute("item",pointMercharsVo);
- model.addAttribute("pictures",list);
- System.out.println(list);
+ model.addAttribute("pictures",result);
return PREFIX + "TGoods_edit.html";
}
@@ -566,10 +672,21 @@
public String payOfDetails(@PathVariable(value = "id") Integer id,Model model) {
System.out.println(id);
model.addAttribute("id",id);
+ PointsMerchandise byId = pointMercharsClient.getById(id);
+ model.addAttribute("type",byId.getType());
return PREFIX + "TGoods_pay.html";
}
-
-
+ /**
+ * 购买详情
+ * @param id 商品id
+ * @return
+ */
+ @RequestMapping("/tPay_detail1/{id}")
+ public String payOfDetailsOne(@PathVariable(value = "id") Integer id,Model model) {
+ System.out.println(id);
+ model.addAttribute("id",id);
+ return PREFIX + "TGoods_payOne.html";
+ }
/**
* 获取 购买记录列表
*/
@@ -582,9 +699,18 @@
payedVo.setPhone(phone);
payedVo.setStatus(status);
List<Map<String,Object>> points = pointMercharsClient.queryUserPayedGoodsList(payedVo);
- System.out.println(points);
+ System.out.println(points);
if (points.size() > 0 ){
+
for (Map<String, Object> point : points) {
+ Object id1 = point.get("id");
+ String idAsString = String.valueOf(id1);
+
+ // 移除原始的 "id" 键
+ point.remove("id");
+
+ // 将字符串类型的 "id" 放回 Map 对象中
+ point.put("id", idAsString);
Integer userId = (Integer) point.get("userId");
TAppUser tAppUser = appUserClient.queryById(userId);
if (ToolUtil.isNotEmpty(tAppUser)){
--
Gitblit v1.7.1