ant-design-vue-jeecg/src/views/shopping/components/billTitle.vue

@@ -8,7 +8,7 @@
     </div>
     <div class="addrList" v-if="billTitle.length != 0">
       <div class="item" v-for="(item,index) in billTitle" :key="index">
-        <p class="default" v-if="item.sort==0"><span class="f_12">默认抬头</span></p>
+        <p class="default" v-if="item.flag"><span class="f_12">默认抬头</span></p>
         <div class="d-flex">
 
           <div><span v-if="item.invoiceType == 1">普通增值税发票</span><span v-if="item.invoiceType == 2">专用增值税发票</span></div>
@@ -27,7 +27,7 @@
               cancel-text="No"
               @confirm="confirm2(item.id)"
               @cancel="cancel"
-              v-if="!item.sort==0"
+              v-if="!item.flag"
             ><span class="btn">将其设置为默认抬头</span></a-popconfirm>
 <!--            <span class="btn" v-if="!item.flag" @click="handleDefault(item.id)">将其设置为默认抬头</span>-->
           </div>
@@ -115,7 +115,7 @@
 </template>
 <script>
   import { httpAction, getAction } from '@/api/manage'
-  import { deleteAction } from '@/api/manage'
+
 
 
   export default {
@@ -204,9 +204,7 @@
         },
 
         url: {
-          findbill: "/getuserpersion/findbill",
+          findbill: "/getuserpersion/findbill"
-          szfpmr: "/getuserpersion/szfpmr",
-          deletefp: "/getuserpersion/deletefp"
 
         },
 
@@ -320,35 +318,14 @@
         this.flag = 'edit'
         this.form = item
       },
-      confirm2(id) {
-
-
-        getAction(this.url.szfpmr,{id,id}).then((res) => {
-          if(res.success) {
-            this.loadData(1);
-          } else {
-          }
-        });
-
-
-/*        let itemIndex = this.billTitle.findIndex(item =>item.id == id)
-        this.billTitle.splice(itemIndex,1)*/
-      },
       confirm1(id) {
-        deleteAction(this.url.deletefp,{id,id}).then((res) => {
+        let itemIndex = this.billTitle.findIndex(item =>item.id == id)
-          if(res.success) {
+        this.billTitle.splice(itemIndex,1)
-            this.loadData(1);
+      },
-          } else {
+      confirm2(id) {
-          }
+        this.changeDefault()
-        });
-
-
-
-
-        /*this.changeDefault()
         let itemIndex2 = this.billTitle.findIndex(item =>item.id == id)
-        this.billTitle[itemIndex2].flag = true*/
+        this.billTitle[itemIndex2].flag = true
-
       },
       cancel(e) {
         this.$message.warning('已取消');

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java

@@ -32,12 +32,6 @@ public interface CustomerInvoiceMapper extends BaseMapper<CustomerInvoice> {
     @Select("select sort from customer_invoice where id=#{id} ")
     int findSort(String id);
 
-    @Select("select * from customer_invoice where user_id=#{username} ")
+    @Select("select * from customer_invoice where create_by=#{username} ")
     List<CustomerInvoice> getfapiao(String username);
-
-    @Select("select * from customer_invoice where user_id=#{userId} and sort=0")
-    CustomerInvoice getmoren(String userId);
-
-    @Select("SELECT * FROM  customer_invoice WHERE user_id=#{userId}  ORDER BY sort DESC LIMIT 1")
-    CustomerInvoice getcmzuida(String userId);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java

@@ -20,8 +20,4 @@ public interface ICustomerInvoiceService extends IService<CustomerInvoice> {
     void up(String id);
 
     List<CustomerInvoice> getfapiao(String username);
-
-    CustomerInvoice getmoren(String userId);
-
-    CustomerInvoice getcmzuida(String userId);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java

@@ -41,17 +41,6 @@ public class CustomerInvoiceServiceImpl extends ServiceImpl<CustomerInvoiceMappe
         return customerInvoiceMapper.getfapiao(username);
     }
 
-    @Override
-    public CustomerInvoice getmoren(String userId) {
-        return customerInvoiceMapper.getmoren(userId);
-    }
-
-    @Override
-    public CustomerInvoice getcmzuida(String userId) {
-        return customerInvoiceMapper.getcmzuida(userId);
-    }
-
-
     @Override
     public int findSort(String id) {
         return customerInvoiceMapper.findSort(id);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ApeopersionController.java

@@ -307,48 +307,8 @@ public class ApeopersionController {
         //这里方便获取当前登陆信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //这里获取当前登陆的用户名
-        String username = loginUser.getId();
+        String username = loginUser.getUsername();
         List<CustomerInvoice> fapiao= customerInvoiceService.getfapiao(username);
         return Result.OK(fapiao);
     }
-
-    //这个是获取个人中心的发票列表的设置默认
-    @RequestMapping(value = "/szfpmr", method = RequestMethod.GET)
-    public Result<?> szfpmr(@RequestParam(name = "id", required = true) String  id) {
-        //得到了发票抬头的id
-        String fpid = id;
-        //根据发票id获取发票的详细信息
-        CustomerInvoice cmi = customerInvoiceService.getById(id);
-        //查询是否有默认排序
-        CustomerInvoice cmimoren= customerInvoiceService.getmoren(cmi.getUserId());
-        if (cmimoren==null){
-            cmi.setSort(0);
-            customerInvoiceService.updateById(cmi);
-        }else{
-            cmimoren.setSort(cmi.getSort());
-            cmi.setSort(0);
-            customerInvoiceService.updateById(cmimoren);
-            customerInvoiceService.updateById(cmi);
-
-        }
-
-        return Result.OK("ok");
-    }
-
-
-
-    /**
-     *   通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "顾客地址表-通过id删除")
-    @ApiOperation(value="顾客地址表-通过id删除", notes="顾客地址表-通过id删除")
-    @DeleteMapping(value = "/deletefp")
-    public Result<?> deletefp(@RequestParam(name="id",required=true) String id) {
-        customerInvoiceService.removeById(id);
-        return Result.OK("删除成功!");
-    }
-
 }