8.7

sp-core/sp-base/src/main/java/com/pj/aliyun/sms/AliyunInformSmsService.java

@@ -24,7 +24,7 @@ public class AliyunInformSmsService {
 
 
     // 签名
-    private static final String signName = "某某公司";
+    private static final String signName = "边民互市";
 
     // 模板
     private static final String templateCode = "SMS_22*****04";

sp-service/level-one-server/src/main/java/com/pj/tb_goods/AppTbGoodsController.java

@@ -0,0 +1,53 @@
+package com.pj.tb_goods;
+
+import com.pj.project4sp.SP;
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ *app端:商品管理
+ * @author yzs
+ */
+@RestController
+@RequestMapping("/app/TbGoods/")
+public class AppTbGoodsController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbGoodsService tbGoodsService;
+
+	/** 增添加商品 */
+	@RequestMapping("add")
+//	@SaCheckPermission(TbGoods.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbGoods t){
+		tbGoodsService.add(t);
+		t = tbGoodsService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+//		@SaCheckPermission(TbGoods.PERMISSION_CODE)
+	public AjaxJson getById(String id){
+		TbGoods t = tbGoodsService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+//		@SaCheckPermission(TbGoods.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbGoods> list = tbGoodsService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsService.java

@@ -53,9 +53,10 @@ public class TbGoodsService extends ServiceImpl<TbGoodsMapper, TbGoods> implemen
 	/** 改 */
 	void update(TbGoods t){
 		updateById(t);
-
 	}
 
+
+
 	/** 查 */
 	TbGoods getById(String id){
 		return super.getById(id);

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/TbGoodsCartApiController.java

@@ -1,7 +1,9 @@
 package com.pj.tb_goods_cart;
 
 import com.pj.tb_goods_cart.dto.GoodsCartInfoDto;
+import com.pj.tb_goods_cart.vo.GoodsCartVo;
 import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +25,24 @@ public class TbGoodsCartApiController {
 	@Autowired
 	TbGoodsCartService tbGoodsCartService;
 
+
+	/** 查 - 根据id */
+	@RequestMapping("getById")
+//		@SaCheckPermission(TbGoodsCart.PERMISSION_CODE)
+	public AjaxJson getById(String id){
+		TbGoodsCart t = tbGoodsCartService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	@RequestMapping("getList")
+//		@SaCheckPermission(TbGoodsCart.PERMISSION_CODE)
+	public AjaxJson getList() {
+		SoMap so = SoMap.getRequestSoMap();
+		List<GoodsCartVo> list = tbGoodsCartService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
 	/** 添加购物车 */
 	@RequestMapping("addGoodsInShopCart")
 	public AjaxJson addGoodsInShopCart(@Validated @RequestBody GoodsCartInfoDto goodsCartInfoDto){

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/TbGoodsCartService.java

@@ -131,10 +131,6 @@ public class TbGoodsCartService extends ServiceImpl<TbGoodsCartMapper, TbGoodsCa
 	/** 删除购物车,可批量 */
 	public int cleanCart(List<Long> ids){
 		if(ids.size() == 0)return 0;
-		//检查登录
-		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
-		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
-			throw new ServiceException("当前登录账号信息已失效!");
 		//清理购物车
 		int batchIds = tbGoodsCartMapper.deleteBatchIds(ids);
 		System.out.println("已清空 " + batchIds + " 个商品!");

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/dto/GoodsCartInfoDto.java

@@ -31,10 +31,10 @@ public class GoodsCartInfoDto {
     @NotNull(message = "区域ID必填")
     private Long tradeAreaId;
     /** goodsTransit商品ID */
-    @NotNull(message = "商品ID必填")
+    @NotNull(message = "goodstransitID必填")
     private Long publishGoodsId;
     /** 商品图片 */
-    @NotNull(message = "商品ID必填")
+    @NotNull(message = "商品图片")
     private String goodsImg;
     /** 商品名称 */
     @NotNull(message = "商品名称必填")

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/MethodGoodsDemandService.java

@@ -1,15 +1,11 @@
 package com.pj.tb_goods_demand;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
 import com.pj.api.dto.GoodsDto;
-import com.pj.api.dto.PeopleDto;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.enummj.DeleteStatus;
-import com.pj.retry.SmsRetryService;
 import com.pj.tb_demand_quotation.TbDemandQuotation;
 import com.pj.tb_demand_quotation.TbDemandQuotationMapper;
-import com.pj.tb_demand_quotation.TbDemandQuotationService;
 import com.pj.tb_goods_demand.vo.GoodsDemandVo;
 import com.pj.tb_orders.TbOrders;
 import com.pj.tb_orders.TbOrdersMapper;
@@ -111,7 +107,7 @@ public class MethodGoodsDemandService {
             tbOrders.setShipperName(tbDemandQuotation.getCreateName()); //卖家名称
             tbOrders.setTradeAreaId(tbDemandQuotation.getTradeAreaId()); //交易地区ID
             tbOrders.setTradeAreaName(tbDemandQuotation.getTradeAreaName());  //交易地区名称
-            tbOrders.setCreateBy(tbDemandQuotation.getLeaderId()); // 订单创建人 -- 边民表主键
+            tbOrders.setCreateBy(appLoginUserInfo.getLoginId()); // 订单创建人 -- appUser表主键
             tbOrders.setPurchaserId(tbGoodsDemand.getPurchaserId());  //买家ID  商户表
             tbOrders.setPurchaserName(tbGoodsDemand.getPurchaserName()); // 买家名称 商户表
             tbOrders.setCreateName(tbDemandQuotation.getCreateName());

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/TbGoodsDemandService.java

@@ -60,9 +60,9 @@ public class TbGoodsDemandService extends ServiceImpl<TbGoodsDemandMapper, TbGoo
 
 	/** app端:专供给一级市场查看的需求列表 */
 	List<TbGoodsDemand> getAppList(SoMap so,Integer isOrders) {
-		so.set("is_orders",isOrders);
-		so.set("sortType",10); //根据日期降序
-		so.set("delete_status", DeleteStatus.DELETE_STATUS_ON.getCode()); // 状态可用
+		so.put("isOrders",isOrders);
+		so.put("sortType",10); //根据日期降序
+		so.put("deleteStatus", DeleteStatus.DELETE_STATUS_ON.getCode()); // 状态可用
 		return tbGoodsDemandMapper.getList(so);	
 	}
 

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.dto.PurchaserDto;
 import com.pj.current.satoken.StpUserUtil;
+import com.pj.enummj.DeleteStatus;
 import com.pj.enummj.People;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -93,7 +94,7 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 		//创建时间
 		purchaser.setCreateTime(new Date());
 		//删除状态:启用
-		purchaser.setDeleteStatus(1);
+		purchaser.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
 
 		// 保存收购商信息
 		int insert = tbPurchaserMapper.insert(purchaser);