7.31 日常开发

sp-core/sp-base/src/main/java/com/pj/current/dto/APPLoginUserInfo.java

@@ -4,10 +4,13 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 @Accessors(chain = true)
 public class APPLoginUserInfo implements Serializable {
     private Long loginId;
     private String loginName;
+//    private List<String> permissions;
+//    private String userType;
 }

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/GoodsTransitAppController.java

@@ -52,7 +52,7 @@ public class GoodsTransitAppController {
 
 
 
-    /** app端用户上架/下架商品 */
+    /** app端 商户确认订单*/
     @RequestMapping("purchaseLevelOntGoodsTransit")
 //    @SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_ADD)
     public AjaxJson purchaseLevelOntGoodsTransit(@Validated @RequestBody PurchaseLevelOneGoodsTransitParam purchaseLevelOneGoodsTransitParam){

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitController.java

@@ -31,7 +31,7 @@ public class TbGoodsTransitController {
 
 	/** 增 */  
 	@RequestMapping("add")
-	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_ADD)
+//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbGoodsTransit t){
 		tbGoodsTransitService.add(t);
 		t = tbGoodsTransitService.getById(SP.publicMapper.getPrimarykey());
@@ -40,7 +40,7 @@ public class TbGoodsTransitController {
 
 	/** 删 */  
 	@RequestMapping("delete")
-	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_DEL)
+//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbGoodsTransitService.delete(id);
 		return AjaxJson.getSuccess();
@@ -48,7 +48,7 @@ public class TbGoodsTransitController {
 	
 	/** 删 - 根据id列表 */  
 	@RequestMapping("deleteByIds")
-	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_DEL)
+//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
 		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
 		int line = SP.publicMapper.deleteByIds(TbGoodsTransit.TABLE_NAME, ids);
@@ -57,7 +57,7 @@ public class TbGoodsTransitController {
 	
 	/** 改 */  
 	@RequestMapping("update")
-	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbGoodsTransit t){
 		tbGoodsTransitService.update(t);
 		return AjaxJson.getSuccess();
@@ -65,7 +65,7 @@ public class TbGoodsTransitController {
 
 	/** 查 - 根据id */  
 	@RequestMapping("getById")
-		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)
+//		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
 		TbGoodsTransit t = tbGoodsTransitService.getById(id);
 		return AjaxJson.getSuccessData(t);
@@ -73,7 +73,7 @@ public class TbGoodsTransitController {
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
 	@RequestMapping("getList")
-		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)
+//		@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE)
 	public AjaxJson getList() { 
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbGoodsTransit> list = tbGoodsTransitService.getList(so.startPage());
@@ -84,7 +84,7 @@ public class TbGoodsTransitController {
 	
 	/** 改 - 商品状态(0=下架,1=在售) */  
 	@RequestMapping("updateGoodsStatus")
-	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
 	public AjaxJson updateGoodsStatus(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbGoodsTransit.TABLE_NAME, "goods_status", value, id);
 		return AjaxJson.getByLine(line);
@@ -92,7 +92,7 @@ public class TbGoodsTransitController {
 	
 	/** 改 - 审核状态(0=待审核,1=通过,2=不通过) */  
 	@RequestMapping("updateAuditStatus")
-	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
 	public AjaxJson updateAuditStatus(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbGoodsTransit.TABLE_NAME, "audit_status", value, id);
 		return AjaxJson.getByLine(line);
@@ -100,7 +100,7 @@ public class TbGoodsTransitController {
 	
 	/** 改 - 删除状态(0=禁用,1=启用) */  
 	@RequestMapping("updateDelStatus")
-	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(TbGoodsTransit.PERMISSION_CODE_EDIT)
 	public AjaxJson updateDelStatus(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbGoodsTransit.TABLE_NAME, "del_status", value, id);
 		return AjaxJson.getByLine(line);

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -257,7 +257,6 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		int insert = tbOrderMapper.insert(tbOrder);
 		if(insert == 1){
 			// todo: 执行订单完成后的逻辑
-
 			// todo: 发送短信给边民组通知其确认
 			//获取互市组ID
 			Long groupId = list.get(0).getId();

sp-service/level-one-server/src/main/java/com/pj/tb_order_after_sale/TbOrderAfterSaleService.java

@@ -63,6 +63,7 @@ public class TbOrderAfterSaleService extends ServiceImpl<TbOrderAfterSaleMapper,
 	/** app查看个人订单 */
 	List<TbOrder> selectSelfOrders(SoMap soMap){
 		//下面调用已获取登陆人信息
+
 		List<TbOrder> tbOrderList = tbOrderService.selectSelfOrders(soMap);
 		return tbOrderList;
 	}

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersApiController.java

@@ -0,0 +1,95 @@
+package com.pj.tb_orders;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * Controller: tb_orders -- 订单表
+ * @author qzy 
+ */
+@RestController
+@RequestMapping("/app/TbOrders/")
+public class TbOrdersApiController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbOrdersService tbOrdersService;
+
+	/** 增 */  
+	@RequestMapping("add")
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbOrders t){
+		tbOrdersService.add(t);
+		t = tbOrdersService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbOrdersService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(TbOrders.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbOrders t){
+		tbOrdersService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+//		@SaCheckPermission(TbOrders.PERMISSION_CODE)
+	public AjaxJson getList(@RequestParam(value = "keyword",required = false)String keyword) {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbOrders> list = tbOrdersService.getList(so.startPage(),keyword);
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	/** 改 - 订单状态已完成 (0=禁用,1=启用) */  
+	@RequestMapping("updateOrderFinish")
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+	public AjaxJson updateOrderFinish(Long id, Integer value){
+		int line = SP.publicMapper.updateColumnById(TbOrders.TABLE_NAME, "order_finish", value, id);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 - 删除状态(0=禁用,1=启用) */  
+	@RequestMapping("updateDeleteStatus")
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+	public AjaxJson updateDeleteStatus(Long id, Integer value){
+		int line = SP.publicMapper.updateColumnById(TbOrders.TABLE_NAME, "delete_status", value, id);
+		return AjaxJson.getByLine(line);
+	}
+	
+	
+
+	
+	
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersController.java

@@ -25,7 +25,7 @@ public class TbOrdersController {
 
 	/** 增 */  
 	@RequestMapping("add")
-	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbOrders t){
 		tbOrdersService.add(t);
 		t = tbOrdersService.getById(SP.publicMapper.getPrimarykey());
@@ -34,7 +34,7 @@ public class TbOrdersController {
 
 	/** 删 */  
 	@RequestMapping("delete")
-	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbOrdersService.delete(id);
 		return AjaxJson.getSuccess();
@@ -42,7 +42,7 @@ public class TbOrdersController {
 	
 	/** 删 - 根据id列表 */  
 	@RequestMapping("deleteByIds")
-	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
 		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
 		int line = SP.publicMapper.deleteByIds(TbOrders.TABLE_NAME, ids);
@@ -51,7 +51,7 @@ public class TbOrdersController {
 	
 	/** 改 */  
 	@RequestMapping("update")
-	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbOrders t){
 		tbOrdersService.update(t);
 		return AjaxJson.getSuccess();
@@ -59,7 +59,7 @@ public class TbOrdersController {
 
 	/** 查 - 根据id */  
 	@RequestMapping("getById")
-		@SaCheckPermission(TbOrders.PERMISSION_CODE)
+//		@SaCheckPermission(TbOrders.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
 		TbOrders t = tbOrdersService.getById(id);
 		return AjaxJson.getSuccessData(t);
@@ -67,10 +67,10 @@ public class TbOrdersController {
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
 	@RequestMapping("getList")
-		@SaCheckPermission(TbOrders.PERMISSION_CODE)
-	public AjaxJson getList(@RequestParam(value = "keyword",required = false)String keyword) {
+//		@SaCheckPermission(TbOrders.PERMISSION_CODE)
+	public AjaxJson getList(@RequestParam(value = "ordersStatus",required = false)Integer ordersStatus) {
 		SoMap so = SoMap.getRequestSoMap();
-		List<TbOrders> list = tbOrdersService.getList(so.startPage(),keyword);
+		List<TbOrders> list = tbOrdersService.getPCList(so.startPage(),ordersStatus);
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 	
@@ -78,24 +78,13 @@ public class TbOrdersController {
 	
 	/** 改 - 订单状态已完成 (0=禁用,1=启用) */  
 	@RequestMapping("updateOrderFinish")
-	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
 	public AjaxJson updateOrderFinish(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbOrders.TABLE_NAME, "order_finish", value, id);
 		return AjaxJson.getByLine(line);
 	}
 	
-	/** 改 - 删除状态(0=禁用,1=启用) */  
-	@RequestMapping("updateDeleteStatus")
-	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
-	public AjaxJson updateDeleteStatus(Long id, Integer value){
-		int line = SP.publicMapper.updateColumnById(TbOrders.TABLE_NAME, "delete_status", value, id);
-		return AjaxJson.getByLine(line);
-	}
-	
-	
 
-	
-	
-	
+
 
 }

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersMapper.java

@@ -26,5 +26,11 @@ public interface TbOrdersMapper extends BaseMapper <TbOrders> {
 	 */
 	List<TbOrders> getList(SoMap so);
 
+	/**
+	 * admin的专属查看订单
+	 * @return
+	 */
+	List<TbOrders> getList();
+
 
 }

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -2,6 +2,7 @@ package com.pj.tb_orders;
 
 import java.util.List;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
@@ -49,6 +50,16 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		return super.getById(id);
 	}
 
+	/** pc端查看订单列表,并可根据状态进行查询 */
+	List<TbOrders> getPCList(SoMap soMap,Integer ordersStatus){
+		//检查登录
+		StpUtil.checkLogin();
+		// PC端只能admin进行登录,默认查询所有
+		soMap.set("order_finish",ordersStatus); // 订单的完成状态
+		soMap.set("sortType",22);  // 根据时间降序
+		return tbOrdersMapper.getList();
+	}
+
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件）
 	 * 管理购买的商品订单（包括已支付、运输中、售后）
 	 * */
@@ -67,6 +78,14 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 
 		return tbOrdersMapper.getList(so);	
 	}
-	
+
+	/**
+	 * 管理二级市场的开票申请信息、并审核
+	 * @param tbOrdersID 二级市场订单ID主键
+	 * @param isBill 审核是否开票状态 1=通过 0=未通过
+	 */
+	public void bill( Long tbOrdersID, Integer isBill){
+		//todo: 管理二级市场的开票申请信息、并审核
+	}
 
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -198,6 +198,8 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		APPLoginUserInfo info=new APPLoginUserInfo();
 		info.setLoginId(appUser.getId());
 		info.setLoginName(appUser.getName());
+//		info.setPermissions(per_list);
+//		info.setUserType(appUser.getUserType());
 		StpAPPUserUtil.cacheAPPLoginInfo(info);
 		return AjaxJson.getSuccessData(map);
 	}

sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/ReRoleMenu.java

@@ -53,7 +53,7 @@ public class ReRoleMenu extends Model<ReRoleMenu> implements Serializable {
 	private Long id;	
 
 	/**
-	 * app用户id 
+	 * 职务id
 	 */
 	private Long appRoleId;	
 

sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/ReRoleMenuController.java

@@ -30,7 +30,7 @@ public class ReRoleMenuController {
 
 	/** 增 */  
 	@RequestMapping("add")
-	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_ADD)
+//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_ADD)
 	public AjaxJson add(ReRoleMenu r){
 		reRoleMenuService.add(r);
 		r = reRoleMenuService.getById(SP.publicMapper.getPrimarykey());
@@ -39,7 +39,7 @@ public class ReRoleMenuController {
 
 	/** 删 */  
 	@RequestMapping("delete")
-	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
+//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 reRoleMenuService.delete(id);
 		return AjaxJson.getSuccess();
@@ -47,7 +47,7 @@ public class ReRoleMenuController {
 	
 	/** 删 - 根据id列表 */  
 	@RequestMapping("deleteByIds")
-	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
+//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
 		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
 		int line = SP.publicMapper.deleteByIds(ReRoleMenu.TABLE_NAME, ids);
@@ -56,7 +56,7 @@ public class ReRoleMenuController {
 	
 	/** 改 */  
 	@RequestMapping("update")
-	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_EDIT)
 	public AjaxJson update(ReRoleMenu r){
 		reRoleMenuService.update(r);
 		return AjaxJson.getSuccess();
@@ -64,7 +64,7 @@ public class ReRoleMenuController {
 
 	/** 查 - 根据id */  
 	@RequestMapping("getById")
-		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+//		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
 		ReRoleMenu r = reRoleMenuService.getById(id);
 		return AjaxJson.getSuccessData(r);
@@ -76,7 +76,7 @@ public class ReRoleMenuController {
 	 * @return
 	 */
 	@RequestMapping("getList")
-		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+//		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
 	public AjaxJson getList(@RequestParam(value = "appRoleId",required = false) Integer appRoleId) {
 		SoMap so = SoMap.getRequestSoMap();
 		List<ReRoleMenu> list = reRoleMenuService.getList(so.startPage(),appRoleId);
@@ -89,7 +89,7 @@ public class ReRoleMenuController {
 	 * @return
 	 */
 	@RequestMapping("assignPermissions")
-		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+//		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
 	public AjaxJson assignPermissions(@Validated @RequestBody AssignPermissionsDto assignPermissionsDto) {
 		boolean permissions = reRoleMenuService.assignPermissions(assignPermissionsDto);
 		if(permissions)return AjaxJson.getSuccess("权限分配成功!");

sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/ReRoleMenuService.java

@@ -5,6 +5,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.pj.common.core.exception.ServiceException;
+import com.pj.current.dto.APPLoginUserInfo;
+import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.project.re_role_menu.dto.AssignPermissionsDto;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +58,7 @@ public class ReRoleMenuService extends ServiceImpl<ReRoleMenuMapper, ReRoleMenu>
 		return reRoleMenuMapper.getList(so);	
 	}
 
+
 	/** 给app角色分配权限 */
 	boolean assignPermissions(AssignPermissionsDto assignPermissionsDto){
 		//取出数据