商户新建更改

src/main/java/com/dk/mdm/mapper/mst/MoneyAccountMapper.xml

@@ -132,6 +132,7 @@
         t.mac_receipt_code,
         t.acc_date,
         t.flg_negative,
+        t.flg_default,
         t.remarks,
         t.flg_valid,
         t.cp_id,

src/main/java/com/dk/mdm/model/response/mst/MoneyAccountResponse.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -110,9 +111,9 @@ public class MoneyAccountResponse extends PageInfo<MoneyAccountResponse> impleme
      */
     @Excel(name = "开户日期")
     @ApiModelProperty(value = "开户日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime accDate;
+    private LocalDate accDate;
 
 
     /**

src/main/java/com/dk/mdm/service/mst/CompanyService.java

@@ -294,6 +294,7 @@ public class CompanyService extends BaseService<Company> {
 		m.put("cpId",cpId);
 		m.put("staffId",staffId);
 		listCom.add(m);
+		map.put("company",listCom);
 		//  角色及权限
 		List<RoleResponse> roleResponses = roleMapper.selectByCond(new RoleQuery());
 		List<Map<String, Object>> listRoles = new ArrayList<>();
@@ -354,8 +355,10 @@ public class CompanyService extends BaseService<Company> {
 			m.put("macName",moneyAccountResponses.get(i).getMacName());
 			m.put("macType",moneyAccountResponses.get(i).getMacType());
 			m.put("balance",moneyAccountResponses.get(i).getBalance());
+			m.put("accDate",moneyAccountResponses.get(i).getAccDate().toString());
 			m.put("displayNo",moneyAccountResponses.get(i).getDisplayNo());
 			m.put("flgDefault",moneyAccountResponses.get(i).getFlgDefault());
+			m.put("flgNegative",moneyAccountResponses.get(i).getFlgNegative());
 			listMoneyAccounts.add(m);
 		}
 		map.put("moneyAccounts",listMoneyAccounts);
@@ -381,6 +384,7 @@ public class CompanyService extends BaseService<Company> {
 			m = new HashMap<>();
 			m.put("catCode",goodsCategoryResponses.get(i).getCatCode());
 			m.put("catName",goodsCategoryResponses.get(i).getCatName());
+			m.put("catId",goodsCategoryResponses.get(i).getCatId());
 			m.put("parentId",goodsCategoryResponses.get(i).getParentId());
 			m.put("topId",goodsCategoryResponses.get(i).getTopId());
 			m.put("levelUpper",goodsCategoryResponses.get(i).getLevelUpper());