code clean

fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantOrderController.java

@@ -55,7 +55,7 @@ public class MerchantOrderController extends BaseController {
     @ApiOperation(value = "获取订单列表")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject list(HttpServletRequest request, @RequestBody OrderListParam orderListParam) throws BusinessCheckException {
+    public ResponseObject list(HttpServletRequest request, @RequestBody OrderListParam params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
 
@@ -69,12 +69,12 @@ public class MerchantOrderController extends BaseController {
             staffInfo = staffService.queryStaffByMobile(mtUser.getMobile());
         }
         if (staffInfo == null) {
-            return getFailureResult(1002, "该账号不是商户");
+            return getFailureResult(1002, "该账号属于任何商户");
         } else if(staffInfo.getStoreId() != null && staffInfo.getStoreId() > 0){
-            orderListParam.setStoreId(staffInfo.getStoreId());
+            params.setStoreId(staffInfo.getStoreId());
         }
 
-        PaginationResponse orderData = orderService.getUserOrderList(orderListParam);
+        PaginationResponse orderData = orderService.getUserOrderList(params);
         return getSuccessResult(orderData);
     }
 
@@ -84,7 +84,7 @@ public class MerchantOrderController extends BaseController {
     @ApiOperation(value = "获取订单详情")
     @RequestMapping(value = "/detail", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject detail(HttpServletRequest request, @RequestBody OrderDetailParam orderDetailParam) throws BusinessCheckException {
+    public ResponseObject detail(HttpServletRequest request, @RequestBody OrderDetailParam param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
 
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
@@ -92,12 +92,12 @@ public class MerchantOrderController extends BaseController {
             return getFailureResult(1001, "用户未登录");
         }
 
-        String orderId = orderDetailParam.getOrderId();
+        String orderId = param.getOrderId();
         if (orderId == null || StringUtil.isEmpty(orderId)) {
             return getFailureResult(2000, "订单不能为空");
         }
 
-        UserOrderDto orderInfo = orderService.getMyOrderById(Integer.parseInt(orderDetailParam.getOrderId()));
+        UserOrderDto orderInfo = orderService.getMyOrderById(Integer.parseInt(param.getOrderId()));
 
         return getSuccessResult(orderInfo);
     }
@@ -108,7 +108,7 @@ public class MerchantOrderController extends BaseController {
     @ApiOperation(value = "取消订单")
     @RequestMapping(value = "/cancel", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject cancel(HttpServletRequest request, @RequestBody OrderDetailParam orderDetailParam) throws BusinessCheckException {
+    public ResponseObject cancel(HttpServletRequest request, @RequestBody OrderDetailParam param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         UserInfo mtUser = TokenUtil.getUserInfoByToken(token);
 
@@ -116,7 +116,7 @@ public class MerchantOrderController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        String orderId = orderDetailParam.getOrderId();
+        String orderId = param.getOrderId();
         if (orderId == null || StringUtil.isEmpty(orderId)) {
             return getFailureResult(201, "订单不能为空");
         }

fuint-application/src/main/resources/vm/java/controller.java.vm

@@ -32,8 +32,7 @@ import com.fuint.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
+public class ${ClassName}Controller extends BaseController {
     @Autowired
     private I${ClassName}Service ${className}Service;
 
@@ -43,15 +42,13 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
     @GetMapping("/list")
 #if($table.crud || $table.sub)
-    public TableDataInfo list(${ClassName} ${className})
-    {
+    public TableDataInfo list(${ClassName} ${className}) {
         startPage();
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return getDataTable(list);
     }
 #elseif($table.tree)
-    public AjaxResult list(${ClassName} ${className})
-    {
+    public AjaxResult list(${ClassName} ${className}) {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return success(list);
     }
@@ -63,8 +60,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ${ClassName} ${className})
-    {
+    public void export(HttpServletResponse response, ${ClassName} ${className}) {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
         util.exportExcel(response, list, "${functionName}数据");
@@ -75,8 +71,7 @@ public class ${ClassName}Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
     @GetMapping(value = "/{${pkColumn.javaField}}")
-    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
         return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
     }
 
@@ -86,8 +81,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ${ClassName} ${className})
-    {
+    public AjaxResult add(@RequestBody ${ClassName} ${className}) {
         return toAjax(${className}Service.insert${ClassName}(${className}));
     }
 
@@ -97,8 +91,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ${ClassName} ${className})
-    {
+    public AjaxResult edit(@RequestBody ${ClassName} ${className}) {
         return toAjax(${className}Service.update${ClassName}(${className}));
     }
 
@@ -108,8 +101,7 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
+    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
         return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
     }
 }

fuint-application/src/main/resources/vm/java/mapper.java.vm

@@ -12,8 +12,8 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
-{
+public interface ${ClassName}Mapper {
+
     /**
      * 查询${functionName}
      * 

fuint-application/src/main/resources/vm/java/model.java.vm

@@ -23,8 +23,7 @@ import com.fuint.common.core.domain.TreeEntity;
 #elseif($table.tree)
 #set($Entity="TreeEntity")
 #end
-public class ${modelName} implements Serializable
-{
+public class ${modelName} implements Serializable {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)